Merge "Remove hidden Settings.getGTalkAndroidId method" (3a808cda) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -12966,19 +12966,6 @@ public final class Settings {
		}
		}

		/**
		* Returns the device ID that we should use when connecting to the mobile gtalk server.
		* This is a string like "android-0x1242", where the hex string is the Android ID obtained
		* from the GoogleLoginService.
		*
		* @param androidId The Android ID for this device.
		* @return The device ID that should be used when connecting to the mobile gtalk server.
		* @hide
		*/
		public static String getGTalkDeviceId(long androidId) {
		return "android-" + Long.toHexString(androidId);
		}

		private static final String[] PM_WRITE_SETTINGS = {
		android.Manifest.permission.WRITE_SETTINGS
		};