am 9158825f: Move some system services to separate directories (49782e46) · Commits · e / os / android_frameworks_base

CleanSpec.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -185,7 +185,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/effects/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/framework-res_intermediates)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/print/IPrintClient.*)

		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/services_intermediates)
		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
		# ************************************************

core/java/android/view/accessibility/AccessibilityManager.java

+27 −13

Original line number	Diff line number	Diff line
		@@ -213,7 +213,8 @@ public final class AccessibilityManager {
		userId = UserHandle.myUserId();
		}
		IBinder iBinder = ServiceManager.getService(Context.ACCESSIBILITY_SERVICE);
		IAccessibilityManager service = IAccessibilityManager.Stub.asInterface(iBinder);
		IAccessibilityManager service = iBinder == null
		? null : IAccessibilityManager.Stub.asInterface(iBinder);
		sInstance = new AccessibilityManager(context, service, userId);
		}
		}
		@@ -233,10 +234,14 @@ public final class AccessibilityManager {
		mHandler = new MyHandler(context.getMainLooper());
		mService = service;
		mUserId = userId;

		if (mService == null) {
		mIsEnabled = false;
		}
		try {
		if (mService != null) {
		final int stateFlags = mService.addClient(mClient, userId);
		setState(stateFlags);
		}
		} catch (RemoteException re) {
		Log.e(LOG_TAG, "AccessibilityManagerService is dead", re);
		}
		@@ -358,14 +363,16 @@ public final class AccessibilityManager {
		public List<AccessibilityServiceInfo> getInstalledAccessibilityServiceList() {
		List<AccessibilityServiceInfo> services = null;
		try {
		if (mService != null) {
		services = mService.getInstalledAccessibilityServiceList(mUserId);
		if (DEBUG) {
		Log.i(LOG_TAG, "Installed AccessibilityServices " + services);
		}
		}
		} catch (RemoteException re) {
		Log.e(LOG_TAG, "Error while obtaining the installed AccessibilityServices. ", re);
		}
		return Collections.unmodifiableList(services);
		return services != null ? Collections.unmodifiableList(services) : Collections.EMPTY_LIST;
		}

		/**
		@@ -385,14 +392,16 @@ public final class AccessibilityManager {
		int feedbackTypeFlags) {
		List<AccessibilityServiceInfo> services = null;
		try {
		if (mService != null) {
		services = mService.getEnabledAccessibilityServiceList(feedbackTypeFlags, mUserId);
		if (DEBUG) {
		Log.i(LOG_TAG, "Installed AccessibilityServices " + services);
		}
		}
		} catch (RemoteException re) {
		Log.e(LOG_TAG, "Error while obtaining the installed AccessibilityServices. ", re);
		}
		return Collections.unmodifiableList(services);
		return services != null ? Collections.unmodifiableList(services) : Collections.EMPTY_LIST;
		}

		/**
		@@ -502,6 +511,9 @@ public final class AccessibilityManager {
		*/
		public int addAccessibilityInteractionConnection(IWindow windowToken,
		IAccessibilityInteractionConnection connection) {
		if (mService == null) {
		return View.NO_ID;
		}
		try {
		return mService.addAccessibilityInteractionConnection(windowToken, connection, mUserId);
		} catch (RemoteException re) {
		@@ -518,7 +530,9 @@ public final class AccessibilityManager {
		*/
		public void removeAccessibilityInteractionConnection(IWindow windowToken) {
		try {
		if (mService != null) {
		mService.removeAccessibilityInteractionConnection(windowToken);
		}
		} catch (RemoteException re) {
		Log.e(LOG_TAG, "Error while removing an accessibility interaction connection. ", re);
		}

services/common_time/Android.mk→libs/common_time/Android.mk

+0 −0

File moved.

View file

services/common_time/clock_recovery.cpp→libs/common_time/clock_recovery.cpp

+0 −0

File moved.

View file

services/common_time/clock_recovery.h→libs/common_time/clock_recovery.h

+0 −0

File moved.

View file