Remove unused cruft. (53680172) · Commits · e / os / android_frameworks_base

packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java

+3 −26

Original line number	Diff line number	Diff line
		@@ -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),

packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -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) {
		}
		}

packages/StatusBarPhone/src/com/android/policy/statusbar/phone/TrackingView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ public class TrackingView extends LinearLayout {
		switch (event.getKeyCode()) {
		case KeyEvent.KEYCODE_BACK:
		if (down) {
		mService.deactivate();
		//mService.deactivate();
		}
		return true;
		}

services/java/com/android/server/status/StatusBarManagerService.java

+1 −41

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub
		net = gatherDisableActionsLocked();
		mNotificationCallbacks.onSetDisabled(net);
		}
		addPendingOp(OP_DISABLE, net);
		//addPendingOp(OP_DISABLE, net);
		}
		}

		@@ -286,46 +286,6 @@ public class StatusBarManagerService extends IStatusBarService.Stub
		// Can be called from any thread
		// ================================================================================

		private void addPendingOp(int code, IBinder key, IconData data, NotificationData n, int i) {
		synchronized (mQueueLock) {
		PendingOp op = new PendingOp();
		op.key = key;
		op.code = code;
		op.iconData = data == null ? null : data.clone();
		op.notificationData = n;
		op.integer = i;
		mQueue.add(op);
		if (mQueue.size() == 1) {
		//mHandler.sendEmptyMessage(2);
		}
		}
		}

		private void addPendingOp(int code, IBinder key, boolean visible) {
		synchronized (mQueueLock) {
		PendingOp op = new PendingOp();
		op.key = key;
		op.code = code;
		op.visible = visible;
		mQueue.add(op);
		if (mQueue.size() == 1) {
		//mHandler.sendEmptyMessage(1);
		}
		}
		}

		private void addPendingOp(int code, int integer) {
		synchronized (mQueueLock) {
		PendingOp op = new PendingOp();
		op.code = code;
		op.integer = integer;
		mQueue.add(op);
		if (mQueue.size() == 1) {
		//mHandler.sendEmptyMessage(1);
		}
		}
		}

		// lock on mDisableRecords
		void manageDisableListLocked(int what, IBinder token, String pkg) {
		if (SPEW) {