Permalink
Browse files

Make some fields of intrnl classes package-private

This makes a little more sense than `private` since they are accessed
outside of the class that they are defined in.

In addition, this fixes errors created by proguard when building with
OpenJDK.

Change-Id: Ib0dd2509f15da5ea3b27fe194b8cd8e9e8d8a776
  • Loading branch information...
1 parent 3e7569a commit 109d6d3658080fe9d72a01d042af3c5b9b447d76 Conley Owens committed with Jean-Baptiste Queru Dec 20, 2011
@@ -2942,40 +2942,39 @@ synchronized boolean terminateScoUsingVirtualVoiceCall() {
* are polled and mock updates sent every 1 second */
private class DebugThread extends Thread {
/** Turns on/off handsfree profile debugging mode */
- private static final String DEBUG_HANDSFREE = "debug.bt.hfp";
+ static final String DEBUG_HANDSFREE = "debug.bt.hfp";
/** Mock battery level change - use 0 to 5 */
- private static final String DEBUG_HANDSFREE_BATTERY = "debug.bt.hfp.battery";
+ static final String DEBUG_HANDSFREE_BATTERY = "debug.bt.hfp.battery";
/** Mock no cellular service when false */
- private static final String DEBUG_HANDSFREE_SERVICE = "debug.bt.hfp.service";
+ static final String DEBUG_HANDSFREE_SERVICE = "debug.bt.hfp.service";
/** Mock cellular roaming when true */
- private static final String DEBUG_HANDSFREE_ROAM = "debug.bt.hfp.roam";
+ static final String DEBUG_HANDSFREE_ROAM = "debug.bt.hfp.roam";
/** false to true transition will force an audio (SCO) connection to
* be established. true to false will force audio to be disconnected
*/
- private static final String DEBUG_HANDSFREE_AUDIO = "debug.bt.hfp.audio";
+ static final String DEBUG_HANDSFREE_AUDIO = "debug.bt.hfp.audio";
/** true allows incoming SCO connection out of call.
*/
- private static final String DEBUG_HANDSFREE_AUDIO_ANYTIME = "debug.bt.hfp.audio_anytime";
+ static final String DEBUG_HANDSFREE_AUDIO_ANYTIME = "debug.bt.hfp.audio_anytime";
/** Mock signal strength change in ASU - use 0 to 31 */
- private static final String DEBUG_HANDSFREE_SIGNAL = "debug.bt.hfp.signal";
+ static final String DEBUG_HANDSFREE_SIGNAL = "debug.bt.hfp.signal";
/** Debug AT+CLCC: print +CLCC result */
- private static final String DEBUG_HANDSFREE_CLCC = "debug.bt.hfp.clcc";
+ static final String DEBUG_HANDSFREE_CLCC = "debug.bt.hfp.clcc";
/** Debug AT+BSIR - Send In Band Ringtones Unsolicited AT command.
* debug.bt.unsol.inband = 0 => AT+BSIR = 0 sent by the AG
* debug.bt.unsol.inband = 1 => AT+BSIR = 0 sent by the AG
* Other values are ignored.
*/
- private static final String DEBUG_UNSOL_INBAND_RINGTONE =
- "debug.bt.unsol.inband";
+ static final String DEBUG_UNSOL_INBAND_RINGTONE = "debug.bt.unsol.inband";
@Override
public void run() {
@@ -105,8 +105,8 @@ void handleGetCLIRResult(int tmpClirArray[]) {
}
private class MyHandler extends Handler {
- private static final int MESSAGE_GET_CLIR = 0;
- private static final int MESSAGE_SET_CLIR = 1;
+ static final int MESSAGE_GET_CLIR = 0;
+ static final int MESSAGE_SET_CLIR = 1;
@Override
public void handleMessage(Message msg) {
@@ -159,4 +159,4 @@ private void handleSetCLIRResponse(Message msg) {
MESSAGE_SET_CLIR, MESSAGE_SET_CLIR, ar.exception));
}
}
-}
+}
@@ -148,8 +148,8 @@ private void updateSummaryText() {
// arg1: action -- register vs. disable
// arg2: get vs. set for the preceding request
private class MyHandler extends Handler {
- private static final int MESSAGE_GET_CF = 0;
- private static final int MESSAGE_SET_CF = 1;
+ static final int MESSAGE_GET_CF = 0;
+ static final int MESSAGE_SET_CF = 1;
@Override
public void handleMessage(Message msg) {
@@ -1414,19 +1414,19 @@ private void onBatteryLow() {
public static final int TONE_UNOBTAINABLE_NUMBER = 14;
// The tone volume relative to other sounds in the stream
- private static final int TONE_RELATIVE_VOLUME_EMERGENCY = 100;
- private static final int TONE_RELATIVE_VOLUME_HIPRI = 80;
- private static final int TONE_RELATIVE_VOLUME_LOPRI = 50;
+ static final int TONE_RELATIVE_VOLUME_EMERGENCY = 100;
+ static final int TONE_RELATIVE_VOLUME_HIPRI = 80;
+ static final int TONE_RELATIVE_VOLUME_LOPRI = 50;
// Buffer time (in msec) to add on to tone timeout value.
// Needed mainly when the timeout value for a tone is the
// exact duration of the tone itself.
- private static final int TONE_TIMEOUT_BUFFER = 20;
+ static final int TONE_TIMEOUT_BUFFER = 20;
// The tone state
- private static final int TONE_OFF = 0;
- private static final int TONE_ON = 1;
- private static final int TONE_STOPPED = 2;
+ static final int TONE_OFF = 0;
+ static final int TONE_ON = 1;
+ static final int TONE_STOPPED = 2;
InCallTonePlayer(int toneId) {
super();
@@ -61,8 +61,8 @@ protected void onClick() {
}
private class MyHandler extends Handler {
- private static final int MESSAGE_GET_CALL_WAITING = 0;
- private static final int MESSAGE_SET_CALL_WAITING = 1;
+ static final int MESSAGE_GET_CALL_WAITING = 0;
+ static final int MESSAGE_SET_CALL_WAITING = 1;
@Override
public void handleMessage(Message msg) {
@@ -102,7 +102,7 @@ protected void onDialogClosed(boolean positiveResult) {
private class CdmaSubscriptionButtonHandler extends Handler {
- private static final int MESSAGE_SET_CDMA_SUBSCRIPTION = 0;
+ static final int MESSAGE_SET_CDMA_SUBSCRIPTION = 0;
@Override
public void handleMessage(Message msg) {
@@ -96,8 +96,8 @@ protected void onDialogClosed(boolean positiveResult) {
private class MyHandler extends Handler {
- private static final int MESSAGE_GET_ROAMING_PREFERENCE = 0;
- private static final int MESSAGE_SET_ROAMING_PREFERENCE = 1;
+ static final int MESSAGE_GET_ROAMING_PREFERENCE = 0;
+ static final int MESSAGE_SET_ROAMING_PREFERENCE = 1;
@Override
public void handleMessage(Message msg) {
@@ -60,8 +60,8 @@ protected void onClick() {
private class MyHandler extends Handler {
- private static final int MESSAGE_GET_VP = 0;
- private static final int MESSAGE_SET_VP = 1;
+ static final int MESSAGE_GET_VP = 0;
+ static final int MESSAGE_SET_VP = 1;
@Override
public void handleMessage(Message msg) {
@@ -388,8 +388,8 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
private class MyHandler extends Handler {
- private static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
- private static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
+ static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
+ static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
@Override
public void handleMessage(Message msg) {
@@ -63,8 +63,8 @@ protected void onClick() {
private class MyHandler extends Handler {
- private static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
- private static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
+ static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
+ static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
@Override
public void handleMessage(Message msg) {

0 comments on commit 109d6d3

Please sign in to comment.