diff options
author | Jack He <siyuanh@google.com> | 2017-08-22 21:21:23 -0700 |
---|---|---|
committer | Jack He <siyuanh@google.com> | 2017-08-24 19:09:58 +0000 |
commit | 9e045d26d0128826b40520f523307d8d16473779 (patch) | |
tree | 8299c300f3b4dbc2a5360c3319ac41bf1b389e55 /framework/java/android/bluetooth/le/AdvertisingSetParameters.java | |
parent | 910201beb0bde1dcf6b33e4ec5d1eb60042419d8 (diff) |
Fix checkstyle errors (2/2)
* Manual style corrections with IDE assistance
* Variable name refactors are done through IDE
* Corrected general style errors such as:
- "final private var" -> "private final var"
- "&&", "+", "||" should not be at the end of line
- Non-static private variable should be like "mVar"
- Private static variable should be like "sVar"
- Code file should always end with newline
- Inherited methods should be annotated with @Override
and no @hide tags
- Public methods should always have a JavaDoc entry
- "int[] array" is preferred over "int array[]"
- private methods should be accessed without "this."
when there is no name collisions.
- "boolean ? true : false" -> boolean
- "boolean ? false : true" -> !boolean
- "boolean == true" OR "boolean != false" -> boolean
- "boolean != true" OR "boolean == false" -> !boolean
Bug: 63596319
Test: make checkbuild, no functional changes
Change-Id: Iabdc2be912a32dd63a53213d175cf1bfef268ccd
Diffstat (limited to 'framework/java/android/bluetooth/le/AdvertisingSetParameters.java')
-rw-r--r-- | framework/java/android/bluetooth/le/AdvertisingSetParameters.java | 175 |
1 files changed, 86 insertions, 89 deletions
diff --git a/framework/java/android/bluetooth/le/AdvertisingSetParameters.java b/framework/java/android/bluetooth/le/AdvertisingSetParameters.java index f795861d19..0c0291eb0e 100644 --- a/framework/java/android/bluetooth/le/AdvertisingSetParameters.java +++ b/framework/java/android/bluetooth/le/AdvertisingSetParameters.java @@ -97,116 +97,116 @@ public final class AdvertisingSetParameters implements Parcelable { */ private static final int LIMITED_ADVERTISING_MAX_MILLIS = 180 * 1000; - private final boolean isLegacy; - private final boolean isAnonymous; - private final boolean includeTxPower; - private final int primaryPhy; - private final int secondaryPhy; - private final boolean connectable; - private final boolean scannable; - private final int interval; - private final int txPowerLevel; + private final boolean mIsLegacy; + private final boolean mIsAnonymous; + private final boolean mIncludeTxPower; + private final int mPrimaryPhy; + private final int mSecondaryPhy; + private final boolean mConnectable; + private final boolean mScannable; + private final int mInterval; + private final int mTxPowerLevel; private AdvertisingSetParameters(boolean connectable, boolean scannable, boolean isLegacy, boolean isAnonymous, boolean includeTxPower, int primaryPhy, int secondaryPhy, int interval, int txPowerLevel) { - this.connectable = connectable; - this.scannable = scannable; - this.isLegacy = isLegacy; - this.isAnonymous = isAnonymous; - this.includeTxPower = includeTxPower; - this.primaryPhy = primaryPhy; - this.secondaryPhy = secondaryPhy; - this.interval = interval; - this.txPowerLevel = txPowerLevel; + mConnectable = connectable; + mScannable = scannable; + mIsLegacy = isLegacy; + mIsAnonymous = isAnonymous; + mIncludeTxPower = includeTxPower; + mPrimaryPhy = primaryPhy; + mSecondaryPhy = secondaryPhy; + mInterval = interval; + mTxPowerLevel = txPowerLevel; } private AdvertisingSetParameters(Parcel in) { - connectable = in.readInt() != 0 ? true : false; - scannable = in.readInt() != 0 ? true : false; - isLegacy = in.readInt() != 0 ? true : false; - isAnonymous = in.readInt() != 0 ? true : false; - includeTxPower = in.readInt() != 0 ? true : false; - primaryPhy = in.readInt(); - secondaryPhy = in.readInt(); - interval = in.readInt(); - txPowerLevel = in.readInt(); + mConnectable = in.readInt() != 0; + mScannable = in.readInt() != 0; + mIsLegacy = in.readInt() != 0; + mIsAnonymous = in.readInt() != 0; + mIncludeTxPower = in.readInt() != 0; + mPrimaryPhy = in.readInt(); + mSecondaryPhy = in.readInt(); + mInterval = in.readInt(); + mTxPowerLevel = in.readInt(); } /** * Returns whether the advertisement will be connectable. */ public boolean isConnectable() { - return connectable; + return mConnectable; } /** * Returns whether the advertisement will be scannable. */ public boolean isScannable() { - return scannable; + return mScannable; } /** * Returns whether the legacy advertisement will be used. */ public boolean isLegacy() { - return isLegacy; + return mIsLegacy; } /** * Returns whether the advertisement will be anonymous. */ public boolean isAnonymous() { - return isAnonymous; + return mIsAnonymous; } /** * Returns whether the TX Power will be included. */ public boolean includeTxPower() { - return includeTxPower; + return mIncludeTxPower; } /** * Returns the primary advertising phy. */ public int getPrimaryPhy() { - return primaryPhy; + return mPrimaryPhy; } /** * Returns the secondary advertising phy. */ public int getSecondaryPhy() { - return secondaryPhy; + return mSecondaryPhy; } /** * Returns the advertising interval. */ public int getInterval() { - return interval; + return mInterval; } /** * Returns the TX power level for advertising. */ public int getTxPowerLevel() { - return txPowerLevel; + return mTxPowerLevel; } @Override public String toString() { - return "AdvertisingSetParameters [connectable=" + connectable - + ", isLegacy=" + isLegacy - + ", isAnonymous=" + isAnonymous - + ", includeTxPower=" + includeTxPower - + ", primaryPhy=" + primaryPhy - + ", secondaryPhy=" + secondaryPhy - + ", interval=" + interval - + ", txPowerLevel=" + txPowerLevel + "]"; + return "AdvertisingSetParameters [connectable=" + mConnectable + + ", isLegacy=" + mIsLegacy + + ", isAnonymous=" + mIsAnonymous + + ", includeTxPower=" + mIncludeTxPower + + ", primaryPhy=" + mPrimaryPhy + + ", secondaryPhy=" + mSecondaryPhy + + ", interval=" + mInterval + + ", txPowerLevel=" + mTxPowerLevel + "]"; } @Override @@ -216,15 +216,15 @@ public final class AdvertisingSetParameters implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(connectable ? 1 : 0); - dest.writeInt(scannable ? 1 : 0); - dest.writeInt(isLegacy ? 1 : 0); - dest.writeInt(isAnonymous ? 1 : 0); - dest.writeInt(includeTxPower ? 1 : 0); - dest.writeInt(primaryPhy); - dest.writeInt(secondaryPhy); - dest.writeInt(interval); - dest.writeInt(txPowerLevel); + dest.writeInt(mConnectable ? 1 : 0); + dest.writeInt(mScannable ? 1 : 0); + dest.writeInt(mIsLegacy ? 1 : 0); + dest.writeInt(mIsAnonymous ? 1 : 0); + dest.writeInt(mIncludeTxPower ? 1 : 0); + dest.writeInt(mPrimaryPhy); + dest.writeInt(mSecondaryPhy); + dest.writeInt(mInterval); + dest.writeInt(mTxPowerLevel); } public static final Parcelable.Creator<AdvertisingSetParameters> CREATOR = @@ -244,16 +244,15 @@ public final class AdvertisingSetParameters implements Parcelable { * Builder class for {@link AdvertisingSetParameters}. */ public static final class Builder { - - private boolean connectable = false; - private boolean scannable = false; - private boolean isLegacy = false; - private boolean isAnonymous = false; - private boolean includeTxPower = false; - private int primaryPhy = BluetoothDevice.PHY_LE_1M; - private int secondaryPhy = BluetoothDevice.PHY_LE_1M; - private int interval = INTERVAL_LOW; - private int txPowerLevel = TX_POWER_MEDIUM; + private boolean mConnectable = false; + private boolean mScannable = false; + private boolean mIsLegacy = false; + private boolean mIsAnonymous = false; + private boolean mIncludeTxPower = false; + private int mPrimaryPhy = BluetoothDevice.PHY_LE_1M; + private int mSecondaryPhy = BluetoothDevice.PHY_LE_1M; + private int mInterval = INTERVAL_LOW; + private int mTxPowerLevel = TX_POWER_MEDIUM; /** * Set whether the advertisement type should be connectable or @@ -265,7 +264,7 @@ public final class AdvertisingSetParameters implements Parcelable { * non-connectable (false). */ public Builder setConnectable(boolean connectable) { - this.connectable = connectable; + mConnectable = connectable; return this; } @@ -278,7 +277,7 @@ public final class AdvertisingSetParameters implements Parcelable { * non-scannable (false). */ public Builder setScannable(boolean scannable) { - this.scannable = scannable; + mScannable = scannable; return this; } @@ -289,7 +288,7 @@ public final class AdvertisingSetParameters implements Parcelable { * @param isLegacy whether legacy advertising mode should be used. */ public Builder setLegacyMode(boolean isLegacy) { - this.isLegacy = isLegacy; + mIsLegacy = isLegacy; return this; } @@ -302,7 +301,7 @@ public final class AdvertisingSetParameters implements Parcelable { * @param isAnonymous whether anonymous advertising should be used. */ public Builder setAnonymous(boolean isAnonymous) { - this.isAnonymous = isAnonymous; + mIsAnonymous = isAnonymous; return this; } @@ -314,7 +313,7 @@ public final class AdvertisingSetParameters implements Parcelable { * @param includeTxPower whether TX power should be included in extended header */ public Builder setIncludeTxPower(boolean includeTxPower) { - this.includeTxPower = includeTxPower; + mIncludeTxPower = includeTxPower; return this; } @@ -331,11 +330,11 @@ public final class AdvertisingSetParameters implements Parcelable { * @throws IllegalArgumentException If the primaryPhy is invalid. */ public Builder setPrimaryPhy(int primaryPhy) { - if (primaryPhy != BluetoothDevice.PHY_LE_1M && - primaryPhy != BluetoothDevice.PHY_LE_CODED) { + if (primaryPhy != BluetoothDevice.PHY_LE_1M + && primaryPhy != BluetoothDevice.PHY_LE_CODED) { throw new IllegalArgumentException("bad primaryPhy " + primaryPhy); } - this.primaryPhy = primaryPhy; + mPrimaryPhy = primaryPhy; return this; } @@ -354,12 +353,12 @@ public final class AdvertisingSetParameters implements Parcelable { * @throws IllegalArgumentException If the secondaryPhy is invalid. */ public Builder setSecondaryPhy(int secondaryPhy) { - if (secondaryPhy != BluetoothDevice.PHY_LE_1M && - secondaryPhy != BluetoothDevice.PHY_LE_2M && - secondaryPhy != BluetoothDevice.PHY_LE_CODED) { + if (secondaryPhy != BluetoothDevice.PHY_LE_1M + && secondaryPhy != BluetoothDevice.PHY_LE_2M + && secondaryPhy != BluetoothDevice.PHY_LE_CODED) { throw new IllegalArgumentException("bad secondaryPhy " + secondaryPhy); } - this.secondaryPhy = secondaryPhy; + mSecondaryPhy = secondaryPhy; return this; } @@ -376,7 +375,7 @@ public final class AdvertisingSetParameters implements Parcelable { if (interval < INTERVAL_MIN || interval > INTERVAL_MAX) { throw new IllegalArgumentException("unknown interval " + interval); } - this.interval = interval; + mInterval = interval; return this; } @@ -393,10 +392,9 @@ public final class AdvertisingSetParameters implements Parcelable { */ public Builder setTxPowerLevel(int txPowerLevel) { if (txPowerLevel < TX_POWER_MIN || txPowerLevel > TX_POWER_MAX) { - throw new IllegalArgumentException("unknown txPowerLevel " + - txPowerLevel); + throw new IllegalArgumentException("unknown txPowerLevel " + txPowerLevel); } - this.txPowerLevel = txPowerLevel; + mTxPowerLevel = txPowerLevel; return this; } @@ -406,35 +404,34 @@ public final class AdvertisingSetParameters implements Parcelable { * @throws IllegalStateException if invalid combination of parameters is used. */ public AdvertisingSetParameters build() { - if (isLegacy) { - if (isAnonymous) { + if (mIsLegacy) { + if (mIsAnonymous) { throw new IllegalArgumentException("Legacy advertising can't be anonymous"); } - if (connectable == true && scannable == false) { + if (mConnectable && !mScannable) { throw new IllegalStateException( "Legacy advertisement can't be connectable and non-scannable"); } - if (includeTxPower) { + if (mIncludeTxPower) { throw new IllegalStateException( "Legacy advertising can't include TX power level in header"); } } else { - if (connectable && scannable) { + if (mConnectable && mScannable) { throw new IllegalStateException( "Advertising can't be both connectable and scannable"); } - if (isAnonymous && connectable) { + if (mIsAnonymous && mConnectable) { throw new IllegalStateException( "Advertising can't be both connectable and anonymous"); } } - return new AdvertisingSetParameters(connectable, scannable, isLegacy, isAnonymous, - includeTxPower, primaryPhy, - secondaryPhy, interval, txPowerLevel); + return new AdvertisingSetParameters(mConnectable, mScannable, mIsLegacy, mIsAnonymous, + mIncludeTxPower, mPrimaryPhy, mSecondaryPhy, mInterval, mTxPowerLevel); } } -}
\ No newline at end of file +} |