Delete unused code. (43f1befa) · Commits · e / os / android_frameworks_base

core/java/android/service/notification/ConditionProviderService.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -167,11 +167,6 @@ public abstract class ConditionProviderService extends Service {
		mHandler.obtainMessage(H.ON_CONNECTED).sendToTarget();
		}

		@Override
		public void onRequestConditions(int relevance) {
		mHandler.obtainMessage(H.ON_REQUEST_CONDITIONS, relevance, 0).sendToTarget();
		}

		@Override
		public void onSubscribe(Uri conditionId) {
		mHandler.obtainMessage(H.ON_SUBSCRIBE, conditionId).sendToTarget();
		@@ -185,7 +180,6 @@ public abstract class ConditionProviderService extends Service {

		private final class H extends Handler {
		private static final int ON_CONNECTED = 1;
		private static final int ON_REQUEST_CONDITIONS = 2;
		private static final int ON_SUBSCRIBE = 3;
		private static final int ON_UNSUBSCRIBE = 4;

		@@ -198,10 +192,6 @@ public abstract class ConditionProviderService extends Service {
		name = "onConnected";
		onConnected();
		break;
		case ON_REQUEST_CONDITIONS:
		name = "onRequestConditions";
		onRequestConditions(msg.arg1);
		break;
		case ON_SUBSCRIBE:
		name = "onSubscribe";
		onSubscribe((Uri)msg.obj);

core/java/android/service/notification/IConditionProvider.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.service.notification.Condition;
		/** @hide */
		oneway interface IConditionProvider {
		void onConnected();
		void onRequestConditions(int relevance);
		void onSubscribe(in Uri conditionId);
		void onUnsubscribe(in Uri conditionId);
		}
		No newline at end of file

services/core/java/com/android/server/notification/ConditionProviders.java

+0 −37

Original line number	Diff line number	Diff line
		@@ -168,24 +168,6 @@ public class ConditionProviders extends ManagedServices {
		}
		}

		public void requestConditions(IConditionListener callback, int relevance) {
		synchronized(mMutex) {
		if (DEBUG) Slog.d(TAG, "requestConditions callback=" + callback
		+ " relevance=" + Condition.relevanceToString(relevance));
		if (callback == null) return;
		relevance = relevance & (Condition.FLAG_RELEVANT_NOW \| Condition.FLAG_RELEVANT_ALWAYS);
		if (relevance != 0) {
		mListeners.put(callback.asBinder(), callback);
		requestConditionsLocked(relevance);
		} else {
		mListeners.remove(callback.asBinder());
		if (mListeners.isEmpty()) {
		requestConditionsLocked(0);
		}
		}
		}
		}

		private Condition[] validateConditions(String pkg, Condition[] conditions) {
		if (conditions == null \|\| conditions.length == 0) return null;
		final int N = conditions.length;
		@@ -382,25 +364,6 @@ public class ConditionProviders extends ManagedServices {
		return info == null ? null : (IConditionProvider) info.service;
		}

		private void requestConditionsLocked(int flags) {
		for (ManagedServiceInfo info : mServices) {
		final IConditionProvider provider = provider(info);
		if (provider == null) continue;
		// clear all stored conditions from this provider that we no longer care about
		for (int i = mRecords.size() - 1; i >= 0; i--) {
		final ConditionRecord r = mRecords.get(i);
		if (r.info != info) continue;
		if (r.subscribed) continue;
		mRecords.remove(i);
		}
		try {
		provider.onRequestConditions(flags);
		} catch (RemoteException e) {
		Slog.w(TAG, "Error requesting conditions from " + info.component, e);
		}
		}
		}

		private static class ConditionRecord {
		public final Uri id;
		public final ComponentName component;

services/core/java/com/android/server/notification/ZenModeConditions.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -59,10 +59,6 @@ public class ZenModeConditions implements ConditionProviders.Callback {
		pw.print(prefix); pw.print("mSubscriptions="); pw.println(mSubscriptions);
		}

		public void requestConditions(IConditionListener callback, int relevance) {
		mConditionProviders.requestConditions(callback, relevance);
		}

		public void evaluateConfig(ZenModeConfig config, boolean processSubscriptions) {
		if (config == null) return;
		if (config.manualRule != null && config.manualRule.condition != null