summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java29
-rw-r--r--packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java12
-rw-r--r--packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingView.java2
3 files changed, 4 insertions, 39 deletions
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java
index 50664b7..8291d70 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java
+++ b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java
@@ -83,18 +83,6 @@ public class PhoneStatusBarService extends StatusBarService {
private static final int MSG_ANIMATE = 1000;
private static final int MSG_ANIMATE_REVEAL = 1001;
- private class DisableRecord implements IBinder.DeathRecipient {
- String pkg;
- int what;
- IBinder token;
-
- public void binderDied() {
- Slog.i(TAG, "binder died for pkg=" + pkg);
- disable(0, token, pkg);
- token.unlinkToDeath(this, 0);
- }
- }
-
public interface NotificationCallbacks {
void onSetDisabled(int status);
void onClearAll();
@@ -113,7 +101,7 @@ public class PhoneStatusBarService extends StatusBarService {
switch (event.getKeyCode()) {
case KeyEvent.KEYCODE_BACK:
if (!down) {
- PhoneStatusBarService.this.deactivate();
+ //TODO PhoneStatusBarService.this.deactivate();
}
return true;
}
@@ -199,7 +187,6 @@ public class PhoneStatusBarService extends StatusBarService {
int[] mAbsPos = new int[2];
// for disabling the status bar
- ArrayList<DisableRecord> mDisableRecords = new ArrayList<DisableRecord>();
int mDisabled = 0;
/**
@@ -867,7 +854,7 @@ public class PhoneStatusBarService extends StatusBarService {
// the stack trace isn't very helpful here. Just log the exception message.
Slog.w(TAG, "Sending contentIntent failed: " + e);
}
- deactivate();
+ //deactivate();
}
}
@@ -1003,16 +990,6 @@ public class PhoneStatusBarService extends StatusBarService {
pw.println(" data=" + n.data);
}
}
- synchronized (mDisableRecords) {
- final int N = mDisableRecords.size();
- pw.println(" mDisableRecords.size=" + N
- + " mDisabled=0x" + Integer.toHexString(mDisabled));
- for (int i=0; i<N; i++) {
- DisableRecord tok = mDisableRecords.get(i);
- pw.println(" [" + i + "] what=0x" + Integer.toHexString(tok.what)
- + " pkg=" + tok.pkg + " token=" + tok.token);
- }
- }
if (false) {
pw.println("see the logcat for a dump of the views we have created.");
@@ -1284,7 +1261,7 @@ public class PhoneStatusBarService extends StatusBarService {
String action = intent.getAction();
if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)
|| Intent.ACTION_SCREEN_OFF.equals(action)) {
- deactivate();
+ //deactivate();
}
else if (Telephony.Intents.SPN_STRINGS_UPDATED_ACTION.equals(action)) {
updateNetworkName(intent.getBooleanExtra(Telephony.Intents.EXTRA_SHOW_SPN, false),
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java
index 89f26b4..c2db405 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java
+++ b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java
@@ -98,17 +98,5 @@ public abstract class StatusBarService extends Service implements CommandQueue.C
* Implement this to add the main status bar view.
*/
protected abstract void addStatusBarView();
-
- public void activate() {
- }
-
- public void deactivate() {
- }
-
- public void toggle() {
- }
-
- public void disable(int what, IBinder token, String pkg) {
- }
}
diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingView.java b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingView.java
index 9b813e6..9eeaf4b 100644
--- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingView.java
+++ b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingView.java
@@ -48,7 +48,7 @@ public class TrackingView extends LinearLayout {
switch (event.getKeyCode()) {
case KeyEvent.KEYCODE_BACK:
if (down) {
- mService.deactivate();
+ //mService.deactivate();
}
return true;
}