diff options
| author | William Clark <wclark@codeaurora.org> | 2015-10-13 13:17:05 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-30 19:31:22 -0800 |
| commit | 570d204c4765330e872806022bd25b7b89b936f8 (patch) | |
| tree | 73d12c5a8a6aa6bb1f4c89660ae6d52a4a81f6da | |
| parent | 114b9c670dabacd2f5e3e7b3f2ae8033221b800c (diff) | |
| download | frameworks_base-570d204c4765330e872806022bd25b7b89b936f8.zip frameworks_base-570d204c4765330e872806022bd25b7b89b936f8.tar.gz frameworks_base-570d204c4765330e872806022bd25b7b89b936f8.tar.bz2 | |
Udpate instrumentation code
Added changes to support new features in QSSP
Change-Id: I92c0a4eb3cb5363fbf08185f25644a3202c38788
27 files changed, 345 insertions, 342 deletions
diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index a3db4aa..eb59f6b 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -329,7 +329,7 @@ public class AccountManager { * @return The account's password, null if none or if the account doesn't exist */ public String getPassword(final Account account) { - android.util.SeempLog.record(25); + android.util.SeempLog.record(22); if (account == null) throw new IllegalArgumentException("account is null"); try { return mService.getPassword(account); @@ -358,7 +358,7 @@ public class AccountManager { * @return The user data, null if the account or key doesn't exist */ public String getUserData(final Account account, final String key) { - android.util.SeempLog.record(26); + android.util.SeempLog.record(23); if (account == null) throw new IllegalArgumentException("account is null"); if (key == null) throw new IllegalArgumentException("key is null"); try { @@ -569,7 +569,7 @@ public class AccountManager { if (authTokenType == null) throw new IllegalArgumentException("authTokenType is null"); return new Future2Task<String>(handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.getAuthTokenLabel(mResponse, accountType, authTokenType); } @@ -615,7 +615,7 @@ public class AccountManager { if (features == null) throw new IllegalArgumentException("features is null"); return new Future2Task<Boolean>(handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.hasFeatures(mResponse, account, features, mContext.getOpPackageName()); } public Boolean bundleToResult(Bundle bundle) throws AuthenticatorException { @@ -668,7 +668,7 @@ public class AccountManager { if (type == null) throw new IllegalArgumentException("type is null"); return new Future2Task<Account[]>(handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.getAccountsByFeatures(mResponse, type, features, mContext.getOpPackageName()); } @@ -712,7 +712,7 @@ public class AccountManager { * already exists, the account is null, or another error occurs. */ public boolean addAccountExplicitly(Account account, String password, Bundle userdata) { - android.util.SeempLog.record(27); + android.util.SeempLog.record(24); if (account == null) throw new IllegalArgumentException("account is null"); try { return mService.addAccountExplicitly(account, password, userdata); @@ -783,7 +783,7 @@ public class AccountManager { return new Future2Task<Account>(handler, callback) { @Override public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.renameAccount(mResponse, account, newName); } @Override @@ -844,12 +844,12 @@ public class AccountManager { @Deprecated public AccountManagerFuture<Boolean> removeAccount(final Account account, AccountManagerCallback<Boolean> callback, Handler handler) { - android.util.SeempLog.record(28); + android.util.SeempLog.record(25); if (account == null) throw new IllegalArgumentException("account is null"); return new Future2Task<Boolean>(handler, callback) { @Override public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.removeAccount(mResponse, account, false); } @Override @@ -932,7 +932,7 @@ public class AccountManager { return new Future2Task<Boolean>(handler, callback) { @Override public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.removeAccountAsUser(mResponse, account, false, userHandle.getIdentifier()); } @Override @@ -1011,7 +1011,6 @@ public class AccountManager { * @param authToken The auth token to invalidate, may be null */ public void invalidateAuthToken(final String accountType, final String authToken) { - android.util.SeempLog.record(117); if (accountType == null) throw new IllegalArgumentException("accountType is null"); try { if (authToken != null) { @@ -1045,7 +1044,6 @@ public class AccountManager { * @see #getAuthToken */ public String peekAuthToken(final Account account, final String authTokenType) { - android.util.SeempLog.record(121); if (account == null) throw new IllegalArgumentException("account is null"); if (authTokenType == null) throw new IllegalArgumentException("authTokenType is null"); try { @@ -1077,7 +1075,7 @@ public class AccountManager { * @param password The password to set, null to clear the password */ public void setPassword(final Account account, final String password) { - android.util.SeempLog.record(29); + android.util.SeempLog.record(26); if (account == null) throw new IllegalArgumentException("account is null"); try { mService.setPassword(account, password); @@ -1107,7 +1105,7 @@ public class AccountManager { * @param account The account whose password to clear */ public void clearPassword(final Account account) { - android.util.SeempLog.record(30); + android.util.SeempLog.record(27); if (account == null) throw new IllegalArgumentException("account is null"); try { mService.clearPassword(account); @@ -1136,7 +1134,7 @@ public class AccountManager { * @param value String value to set, {@code null} to clear this user data key */ public void setUserData(final Account account, final String key, final String value) { - android.util.SeempLog.record(31); + android.util.SeempLog.record(28); if (account == null) throw new IllegalArgumentException("account is null"); if (key == null) throw new IllegalArgumentException("key is null"); try { @@ -1167,7 +1165,6 @@ public class AccountManager { * @param authToken The auth token to add to the cache */ public void setAuthToken(Account account, final String authTokenType, final String authToken) { - android.util.SeempLog.record(122); if (account == null) throw new IllegalArgumentException("account is null"); if (authTokenType == null) throw new IllegalArgumentException("authTokenType is null"); try { @@ -1289,7 +1286,7 @@ public class AccountManager { optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName()); return new AmsTask(activity, handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.getAuthToken(mResponse, account, authTokenType, false /* notifyOnAuthFailure */, true /* expectActivityLaunch */, optionsIn); @@ -1458,7 +1455,7 @@ public class AccountManager { optionsIn.putString(KEY_ANDROID_PACKAGE_NAME, mContext.getPackageName()); return new AmsTask(null, handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.getAuthToken(mResponse, account, authTokenType, notifyAuthFailure, false /* expectActivityLaunch */, optionsIn); } @@ -1519,7 +1516,7 @@ public class AccountManager { final String authTokenType, final String[] requiredFeatures, final Bundle addAccountOptions, final Activity activity, AccountManagerCallback<Bundle> callback, Handler handler) { - android.util.SeempLog.record(32); + android.util.SeempLog.record(29); if (accountType == null) throw new IllegalArgumentException("accountType is null"); final Bundle optionsIn = new Bundle(); if (addAccountOptions != null) { @@ -1529,7 +1526,7 @@ public class AccountManager { return new AmsTask(activity, handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.addAccount(mResponse, accountType, authTokenType, requiredFeatures, activity != null, optionsIn); } @@ -1554,7 +1551,7 @@ public class AccountManager { return new AmsTask(activity, handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.addAccountAsUser(mResponse, accountType, authTokenType, requiredFeatures, activity != null, optionsIn, userHandle.getIdentifier()); } @@ -1712,7 +1709,6 @@ public class AccountManager { final Activity activity, final AccountManagerCallback<Bundle> callback, final Handler handler) { - android.util.SeempLog.record(116); return confirmCredentialsAsUser(account, options, activity, callback, handler, Process.myUserHandle()); } @@ -1731,7 +1727,7 @@ public class AccountManager { final int userId = userHandle.getIdentifier(); return new AmsTask(activity, handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.confirmCredentialsAsUser(mResponse, account, options, activity != null, userId); } @@ -1791,11 +1787,9 @@ public class AccountManager { final Bundle options, final Activity activity, final AccountManagerCallback<Bundle> callback, final Handler handler) { - android.util.SeempLog.record(118); if (account == null) throw new IllegalArgumentException("account is null"); return new AmsTask(activity, handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); mService.updateCredentials(mResponse, account, authTokenType, activity != null, options); } @@ -1846,11 +1840,11 @@ public class AccountManager { public AccountManagerFuture<Bundle> editProperties(final String accountType, final Activity activity, final AccountManagerCallback<Bundle> callback, final Handler handler) { - android.util.SeempLog.record(33); + android.util.SeempLog.record(30); if (accountType == null) throw new IllegalArgumentException("accountType is null"); return new AmsTask(activity, handler, callback) { public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); mService.editProperties(mResponse, accountType, activity != null); } }.start(); @@ -2206,7 +2200,7 @@ public class AccountManager { private volatile int mNumAccounts = 0; public void doWork() throws RemoteException { - android.util.SeempLog.record(34); + android.util.SeempLog.record(31); getAccountsByTypeAndFeatures(mAccountType, mFeatures, new AccountManagerCallback<Account[]>() { public void run(AccountManagerFuture<Account[]> future) { diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index fef1c8a..cddcd9f 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -374,7 +374,7 @@ public class Instrumentation { * @see Context#startActivity */ public Activity startActivitySync(Intent intent) { - android.util.SeempLog.record_str(406, intent.toString()); + android.util.SeempLog.record_str(376, intent.toString()); validateNotAppThread(); synchronized (mSync) { @@ -1482,7 +1482,7 @@ public class Instrumentation { public ActivityResult execStartActivity( Context who, IBinder contextThread, IBinder token, Activity target, Intent intent, int requestCode, Bundle options) { - android.util.SeempLog.record_str(407, intent.toString()); + android.util.SeempLog.record_str(377, intent.toString()); IApplicationThread whoThread = (IApplicationThread) contextThread; Uri referrer = target != null ? target.onProvideReferrer() : null; if (referrer != null) { @@ -1543,7 +1543,7 @@ public class Instrumentation { public void execStartActivitiesAsUser(Context who, IBinder contextThread, IBinder token, Activity target, Intent[] intents, Bundle options, int userId) { - android.util.SeempLog.record_str(408, intents.toString()); + android.util.SeempLog.record_str(378, intents.toString()); IApplicationThread whoThread = (IApplicationThread) contextThread; if (mActivityMonitors != null) { synchronized (mSync) { @@ -1607,7 +1607,7 @@ public class Instrumentation { public ActivityResult execStartActivity( Context who, IBinder contextThread, IBinder token, String target, Intent intent, int requestCode, Bundle options) { - android.util.SeempLog.record_str(407, intent.toString()); + android.util.SeempLog.record_str(377, intent.toString()); IApplicationThread whoThread = (IApplicationThread) contextThread; if (mActivityMonitors != null) { synchronized (mSync) { @@ -1668,7 +1668,7 @@ public class Instrumentation { public ActivityResult execStartActivity( Context who, IBinder contextThread, IBinder token, Activity target, Intent intent, int requestCode, Bundle options, UserHandle user) { - android.util.SeempLog.record_str(407, intent.toString()); + android.util.SeempLog.record_str(377, intent.toString()); IApplicationThread whoThread = (IApplicationThread) contextThread; if (mActivityMonitors != null) { synchronized (mSync) { @@ -1708,7 +1708,7 @@ public class Instrumentation { Context who, IBinder contextThread, IBinder token, Activity target, Intent intent, int requestCode, Bundle options, boolean ignoreTargetSecurity, int userId) { - android.util.SeempLog.record_str(409, intent.toString()); + android.util.SeempLog.record_str(379, intent.toString()); IApplicationThread whoThread = (IApplicationThread) contextThread; if (mActivityMonitors != null) { synchronized (mSync) { @@ -1747,7 +1747,7 @@ public class Instrumentation { public void execStartActivityFromAppTask( Context who, IBinder contextThread, IAppTask appTask, Intent intent, Bundle options) { - android.util.SeempLog.record_str(410, intent.toString()); + android.util.SeempLog.record_str(380, intent.toString()); IApplicationThread whoThread = (IApplicationThread) contextThread; if (mActivityMonitors != null) { synchronized (mSync) { diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 8fd63d7..24beba6 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -541,7 +541,7 @@ public final class BluetoothAdapter { * @throws IllegalArgumentException if address is invalid */ public BluetoothDevice getRemoteDevice(String address) { - android.util.SeempLog.record(79); + android.util.SeempLog.record(62); return new BluetoothDevice(address); } @@ -557,7 +557,7 @@ public final class BluetoothAdapter { * @throws IllegalArgumentException if address is invalid */ public BluetoothDevice getRemoteDevice(byte[] address) { - android.util.SeempLog.record(79); + android.util.SeempLog.record(62); if (address == null || address.length != 6) { throw new IllegalArgumentException("Bluetooth address must have 6 bytes"); } @@ -789,7 +789,7 @@ public final class BluetoothAdapter { @RequiresPermission(Manifest.permission.BLUETOOTH) @AdapterState public int getState() { - android.util.SeempLog.record(80); + android.util.SeempLog.record(63); try { synchronized(mManagerCallback) { if (mService != null) @@ -886,7 +886,7 @@ public final class BluetoothAdapter { */ @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean enable() { - android.util.SeempLog.record(73); + android.util.SeempLog.record(56); int state = STATE_OFF; if (isEnabled() == true){ if (DBG) Log.d(TAG, "enable(): BT is already enabled..!"); @@ -936,7 +936,7 @@ public final class BluetoothAdapter { */ @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean disable() { - android.util.SeempLog.record(74); + android.util.SeempLog.record(57); try { return mManagerService.disable(true); } catch (RemoteException e) {Log.e(TAG, "", e);} @@ -954,7 +954,7 @@ public final class BluetoothAdapter { * @hide */ public boolean disable(boolean persist) { - android.util.SeempLog.record(74); + android.util.SeempLog.record(57); try { return mManagerService.disable(persist); @@ -1199,7 +1199,7 @@ public final class BluetoothAdapter { */ @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean startDiscovery() { - android.util.SeempLog.record(75); + android.util.SeempLog.record(58); if (getState() != STATE_ON) return false; try { synchronized(mManagerCallback) { @@ -1418,7 +1418,7 @@ public final class BluetoothAdapter { */ @RequiresPermission(Manifest.permission.BLUETOOTH) public Set<BluetoothDevice> getBondedDevices() { - android.util.SeempLog.record(78); + android.util.SeempLog.record(61); if (getState() != STATE_ON) { return toDeviceSet(new BluetoothDevice[0]); } @@ -1471,7 +1471,7 @@ public final class BluetoothAdapter { */ @RequiresPermission(Manifest.permission.BLUETOOTH) public int getProfileConnectionState(int profile) { - android.util.SeempLog.record(81); + android.util.SeempLog.record(64); if (getState() != STATE_ON) return BluetoothProfile.STATE_DISCONNECTED; try { synchronized(mManagerCallback) { @@ -1594,7 +1594,7 @@ public final class BluetoothAdapter { @RequiresPermission(Manifest.permission.BLUETOOTH) public BluetoothServerSocket listenUsingInsecureRfcommWithServiceRecord(String name, UUID uuid) throws IOException { - android.util.SeempLog.record(76); + android.util.SeempLog.record(59); return createNewRfcommSocketAndRecord(name, uuid, false, false); } diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 9208faf..863ca65 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -431,7 +431,7 @@ public abstract class ContentResolver { public final @Nullable Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) { - android.util.SeempLog.record(16); + android.util.SeempLog.record_uri(13, uri); return query(uri, projection, selection, selectionArgs, sortOrder, null); } @@ -472,7 +472,7 @@ public abstract class ContentResolver { public final @Nullable Cursor query(final @NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder, @Nullable CancellationSignal cancellationSignal) { - android.util.SeempLog.record(16); + android.util.SeempLog.record_uri(13, uri); Preconditions.checkNotNull(uri, "uri"); IContentProvider unstableProvider = acquireUnstableProvider(uri); if (unstableProvider == null) { @@ -1225,7 +1225,7 @@ public abstract class ContentResolver { * @return the URL of the newly created row. */ public final @Nullable Uri insert(@NonNull Uri url, @Nullable ContentValues values) { - android.util.SeempLog.record(50); + android.util.SeempLog.record_uri(37, url); Preconditions.checkNotNull(url, "url"); IContentProvider provider = acquireProvider(url); if (provider == null) { diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 218f7f1..dc576a5 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -789,7 +789,7 @@ public class Camera { * @see android.media.MediaActionSound */ public final void setPreviewCallback(PreviewCallback cb) { - android.util.SeempLog.record(83); + android.util.SeempLog.record(66); mPreviewCallback = cb; mOneShot = false; mWithBuffer = false; @@ -816,7 +816,7 @@ public class Camera { * @see android.media.MediaActionSound */ public final void setOneShotPreviewCallback(PreviewCallback cb) { - android.util.SeempLog.record(85); + android.util.SeempLog.record(68); mPreviewCallback = cb; mOneShot = true; mWithBuffer = false; @@ -855,7 +855,7 @@ public class Camera { * @see android.media.MediaActionSound */ public final void setPreviewCallbackWithBuffer(PreviewCallback cb) { - android.util.SeempLog.record(84); + android.util.SeempLog.record(67); mPreviewCallback = cb; mOneShot = false; mWithBuffer = true; @@ -1418,7 +1418,7 @@ public class Camera { */ public final void takePicture(ShutterCallback shutter, PictureCallback raw, PictureCallback jpeg) { - android.util.SeempLog.record(82); + android.util.SeempLog.record(65); takePicture(shutter, raw, null, jpeg); } private native final void native_takePicture(int msgType); @@ -1454,7 +1454,7 @@ public class Camera { */ public final void takePicture(ShutterCallback shutter, PictureCallback raw, PictureCallback postview, PictureCallback jpeg) { - android.util.SeempLog.record(82); + android.util.SeempLog.record(65); mShutterCallback = shutter; mRawImageCallback = raw; mPostviewCallback = postview; diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index e8e27d1..5d405f9 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -517,7 +517,6 @@ public abstract class SensorManager { */ @Deprecated public boolean registerListener(SensorListener listener, int sensors) { - android.util.SeempLog.record(107); return registerListener(listener, sensors, SENSOR_DELAY_NORMAL); } @@ -546,7 +545,6 @@ public abstract class SensorManager { */ @Deprecated public boolean registerListener(SensorListener listener, int sensors, int rate) { - android.util.SeempLog.record(107); return getLegacySensorManager().registerListener(listener, sensors, rate); } @@ -684,7 +682,6 @@ public abstract class SensorManager { */ public boolean registerListener(SensorEventListener listener, Sensor sensor, int samplingPeriodUs) { - android.util.SeempLog.record(107); return registerListener(listener, sensor, samplingPeriodUs, null); } @@ -742,7 +739,6 @@ public abstract class SensorManager { */ public boolean registerListener(SensorEventListener listener, Sensor sensor, int samplingPeriodUs, int maxReportLatencyUs) { - android.util.SeempLog.record(107); int delay = getDelay(samplingPeriodUs); return registerListenerImpl(listener, sensor, delay, null, maxReportLatencyUs, 0); } @@ -778,7 +774,6 @@ public abstract class SensorManager { */ public boolean registerListener(SensorEventListener listener, Sensor sensor, int samplingPeriodUs, Handler handler) { - android.util.SeempLog.record(107); int delay = getDelay(samplingPeriodUs); return registerListenerImpl(listener, sensor, delay, handler, 0, 0); } @@ -810,7 +805,6 @@ public abstract class SensorManager { */ public boolean registerListener(SensorEventListener listener, Sensor sensor, int samplingPeriodUs, int maxReportLatencyUs, Handler handler) { - android.util.SeempLog.record(107); int delayUs = getDelay(samplingPeriodUs); return registerListenerImpl(listener, sensor, delayUs, handler, maxReportLatencyUs, 0); } diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java index 2851349..ecf558c 100644 --- a/core/java/android/hardware/SystemSensorManager.java +++ b/core/java/android/hardware/SystemSensorManager.java @@ -101,7 +101,7 @@ public class SystemSensorManager extends SensorManager { @Override protected boolean registerListenerImpl(SensorEventListener listener, Sensor sensor, int delayUs, Handler handler, int maxBatchReportLatencyUs, int reservedFlags) { - android.util.SeempLog.record_sensor_rate(411, sensor, delayUs); + android.util.SeempLog.record_sensor_rate(381, sensor, delayUs); if (listener == null || sensor == null) { Log.e(TAG, "sensor or listener is null"); return false; @@ -143,7 +143,7 @@ public class SystemSensorManager extends SensorManager { /** @hide */ @Override protected void unregisterListenerImpl(SensorEventListener listener, Sensor sensor) { - android.util.SeempLog.record(412); + android.util.SeempLog.record_sensor(382, sensor); // Trigger Sensors should use the cancelTriggerSensor call. if (sensor != null && sensor.getReportingMode() == Sensor.REPORTING_MODE_ONE_SHOT) { return; diff --git a/core/java/android/provider/Browser.java b/core/java/android/provider/Browser.java index 0c575b4..299a95c 100644 --- a/core/java/android/provider/Browser.java +++ b/core/java/android/provider/Browser.java @@ -244,7 +244,7 @@ public class Browser { */ public static final Cursor getAllBookmarks(ContentResolver cr) throws IllegalStateException { - android.util.SeempLog.record(41); + android.util.SeempLog.record(32); return new MatrixCursor(new String[]{Bookmarks.URL}, 0); } @@ -257,7 +257,7 @@ public class Browser { */ public static final Cursor getAllVisitedUrls(ContentResolver cr) throws IllegalStateException { - android.util.SeempLog.record(42); + android.util.SeempLog.record(33); return new MatrixCursor(new String[]{Combined.URL}, 0); } @@ -266,7 +266,7 @@ public class Browser { } private static final Cursor getVisitedLike(ContentResolver cr, String url) { - android.util.SeempLog.record(44); + android.util.SeempLog.record(34); boolean secure = false; String compareString = url; if (compareString.startsWith("http://")) { @@ -317,7 +317,6 @@ public class Browser { */ public static final void updateVisitedHistory(ContentResolver cr, String url, boolean real) { - android.util.SeempLog.record(47); } /** @@ -328,7 +327,7 @@ public class Browser { */ @Deprecated public static final String[] getVisitedHistory(ContentResolver cr) { - android.util.SeempLog.record(43); + android.util.SeempLog.record(35); return new String[0]; } @@ -343,7 +342,6 @@ public class Browser { * @removed */ public static final void truncateHistory(ContentResolver cr) { - android.util.SeempLog.record(46); } /** @@ -354,7 +352,6 @@ public class Browser { * @removed */ public static final boolean canClearHistory(ContentResolver cr) { - android.util.SeempLog.record(36); return false; } @@ -382,7 +379,6 @@ public class Browser { */ public static final void deleteHistoryTimeFrame(ContentResolver cr, long begin, long end) { - android.util.SeempLog.record(39); } /** @@ -394,7 +390,6 @@ public class Browser { */ public static final void deleteFromHistory(ContentResolver cr, String url) { - android.util.SeempLog.record(38); } /** @@ -405,7 +400,6 @@ public class Browser { * @removed */ public static final void addSearchUrl(ContentResolver cr, String search) { - android.util.SeempLog.record(35); } /** @@ -415,7 +409,6 @@ public class Browser { * @removed */ public static final void clearSearches(ContentResolver cr) { - android.util.SeempLog.record(48); } /** @@ -432,7 +425,7 @@ public class Browser { */ public static final void requestAllIcons(ContentResolver cr, String where, WebIconDatabase.IconListener listener) { - android.util.SeempLog.record(45); + android.util.SeempLog.record(36); // Do nothing: this is no longer used. } diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 3a063e2..0e7f487 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -1505,7 +1505,7 @@ public final class ContactsContract { * {@link #CONTENT_LOOKUP_URI} to attempt refreshing. */ public static Uri getLookupUri(ContentResolver resolver, Uri contactUri) { - android.util.SeempLog.record(109); + android.util.SeempLog.record(86); final Cursor c = resolver.query(contactUri, new String[] { Contacts.LOOKUP_KEY, Contacts._ID }, null, null, null); @@ -1533,7 +1533,7 @@ public final class ContactsContract { * provided parameters. */ public static Uri getLookupUri(long contactId, String lookupKey) { - android.util.SeempLog.record(109); + android.util.SeempLog.record(86); if (TextUtils.isEmpty(lookupKey)) { return null; } @@ -1547,7 +1547,7 @@ public final class ContactsContract { * Returns null if the contact cannot be found. */ public static Uri lookupContact(ContentResolver resolver, Uri lookupUri) { - android.util.SeempLog.record(110); + android.util.SeempLog.record(87); if (lookupUri == null) { return null; } @@ -2010,7 +2010,7 @@ public final class ContactsContract { */ public static InputStream openContactPhotoInputStream(ContentResolver cr, Uri contactUri, boolean preferHighres) { - android.util.SeempLog.record(111); + android.util.SeempLog.record(88); if (preferHighres) { final Uri displayPhotoUri = Uri.withAppendedPath(contactUri, Contacts.Photo.DISPLAY_PHOTO); @@ -2058,7 +2058,7 @@ public final class ContactsContract { * of the thumbnail the high-res picture is preferred */ public static InputStream openContactPhotoInputStream(ContentResolver cr, Uri contactUri) { - android.util.SeempLog.record(111); + android.util.SeempLog.record(88); return openContactPhotoInputStream(cr, contactUri, false); } } @@ -2751,7 +2751,7 @@ public final class ContactsContract { * entry of the given {@link RawContacts} entry. */ public static Uri getContactLookupUri(ContentResolver resolver, Uri rawContactUri) { - android.util.SeempLog.record(112); + android.util.SeempLog.record(89); // TODO: use a lighter query by joining rawcontacts with contacts in provider final Uri dataUri = Uri.withAppendedPath(rawContactUri, Data.CONTENT_DIRECTORY); final Cursor cursor = resolver.query(dataUri, new String[] { @@ -4698,7 +4698,7 @@ public final class ContactsContract { * </p> */ public static Uri getContactLookupUri(ContentResolver resolver, Uri dataUri) { - android.util.SeempLog.record(112); + android.util.SeempLog.record(89); final Cursor cursor = resolver.query(dataUri, new String[] { RawContacts.CONTACT_ID, Contacts.LOOKUP_KEY }, null, null, null); diff --git a/core/java/android/speech/SpeechRecognizer.java b/core/java/android/speech/SpeechRecognizer.java index 0bd7ecb..3eb24e4 100644 --- a/core/java/android/speech/SpeechRecognizer.java +++ b/core/java/android/speech/SpeechRecognizer.java @@ -260,7 +260,7 @@ public class SpeechRecognizer { * not set explicitly, default values will be used by the recognizer. */ public void startListening(final Intent recognizerIntent) { - android.util.SeempLog.record(91); + android.util.SeempLog.record(72); if (recognizerIntent == null) { throw new IllegalArgumentException("intent must not be null"); } diff --git a/core/java/android/util/SeempLog.java b/core/java/android/util/SeempLog.java index 1791635..6e6cce6 100644 --- a/core/java/android/util/SeempLog.java +++ b/core/java/android/util/SeempLog.java @@ -121,214 +121,214 @@ public final class SeempLog { /** @hide */ public static native int seemp_println_native(int api, String msg); - public static final int SEEMP_API_android_provider_Settings__get_ANDROID_ID_ = 8; - public static final int SEEMP_API_android_provider_Settings__get_ACCELEROMETER_ROTATION_ = 126; - public static final int SEEMP_API_android_provider_Settings__get_USER_ROTATION_ = 127; - public static final int SEEMP_API_android_provider_Settings__get_ADB_ENABLED_ = 128; - public static final int SEEMP_API_android_provider_Settings__get_DEBUG_APP_ = 129; - public static final int SEEMP_API_android_provider_Settings__get_WAIT_FOR_DEBUGGER_ = 130; - public static final int SEEMP_API_android_provider_Settings__get_AIRPLANE_MODE_ON_ = 131; - public static final int SEEMP_API_android_provider_Settings__get_AIRPLANE_MODE_RADIOS_ = 132; - public static final int SEEMP_API_android_provider_Settings__get_ALARM_ALERT_ = 133; - public static final int SEEMP_API_android_provider_Settings__get_NEXT_ALARM_FORMATTED_ = 134; - public static final int SEEMP_API_android_provider_Settings__get_ALWAYS_FINISH_ACTIVITIES_ = 135; - public static final int SEEMP_API_android_provider_Settings__get_LOGGING_ID_ = 136; - public static final int SEEMP_API_android_provider_Settings__get_ANIMATOR_DURATION_SCALE_ = 137; - public static final int SEEMP_API_android_provider_Settings__get_WINDOW_ANIMATION_SCALE_ = 138; - public static final int SEEMP_API_android_provider_Settings__get_FONT_SCALE_ = 139; - public static final int SEEMP_API_android_provider_Settings__get_SCREEN_BRIGHTNESS_ = 140; - public static final int SEEMP_API_android_provider_Settings__get_SCREEN_BRIGHTNESS_MODE_ = 141; - public static final int SEEMP_API_android_provider_Settings__get_SCREEN_BRIGHTNESS_MODE_AUTOMATIC_ = 142; - public static final int SEEMP_API_android_provider_Settings__get_SCREEN_BRIGHTNESS_MODE_MANUAL_ = 143; - public static final int SEEMP_API_android_provider_Settings__get_SCREEN_OFF_TIMEOUT_ = 144; - public static final int SEEMP_API_android_provider_Settings__get_DIM_SCREEN_ = 145; - public static final int SEEMP_API_android_provider_Settings__get_TRANSITION_ANIMATION_SCALE_ = 146; - public static final int SEEMP_API_android_provider_Settings__get_STAY_ON_WHILE_PLUGGED_IN_ = 147; - public static final int SEEMP_API_android_provider_Settings__get_WALLPAPER_ACTIVITY_ = 148; - public static final int SEEMP_API_android_provider_Settings__get_SHOW_PROCESSES_ = 149; - public static final int SEEMP_API_android_provider_Settings__get_SHOW_WEB_SUGGESTIONS_ = 150; - public static final int SEEMP_API_android_provider_Settings__get_SHOW_GTALK_SERVICE_STATUS_ = 151; - public static final int SEEMP_API_android_provider_Settings__get_USE_GOOGLE_MAIL_ = 152; - public static final int SEEMP_API_android_provider_Settings__get_AUTO_TIME_ = 153; - public static final int SEEMP_API_android_provider_Settings__get_AUTO_TIME_ZONE_ = 154; - public static final int SEEMP_API_android_provider_Settings__get_DATE_FORMAT_ = 155; - public static final int SEEMP_API_android_provider_Settings__get_TIME_12_24_ = 156; - public static final int SEEMP_API_android_provider_Settings__get_BLUETOOTH_DISCOVERABILITY_ = 157; - public static final int SEEMP_API_android_provider_Settings__get_BLUETOOTH_DISCOVERABILITY_TIMEOUT_ = 158; - public static final int SEEMP_API_android_provider_Settings__get_BLUETOOTH_ON_ = 159; - public static final int SEEMP_API_android_provider_Settings__get_DEVICE_PROVISIONED_ = 160; - public static final int SEEMP_API_android_provider_Settings__get_SETUP_WIZARD_HAS_RUN_ = 161; - public static final int SEEMP_API_android_provider_Settings__get_DTMF_TONE_WHEN_DIALING_ = 162; - public static final int SEEMP_API_android_provider_Settings__get_END_BUTTON_BEHAVIOR_ = 163; - public static final int SEEMP_API_android_provider_Settings__get_RINGTONE_ = 164; - public static final int SEEMP_API_android_provider_Settings__get_MODE_RINGER_ = 165; - public static final int SEEMP_API_android_provider_Settings__get_INSTALL_NON_MARKET_APPS_ = 166; - public static final int SEEMP_API_android_provider_Settings__get_LOCATION_PROVIDERS_ALLOWED_ = 167; - public static final int SEEMP_API_android_provider_Settings__get_LOCK_PATTERN_ENABLED_ = 168; - public static final int SEEMP_API_android_provider_Settings__get_LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED_ = 169; - public static final int SEEMP_API_android_provider_Settings__get_LOCK_PATTERN_VISIBLE_ = 170; - public static final int SEEMP_API_android_provider_Settings__get_NETWORK_PREFERENCE_ = 171; - public static final int SEEMP_API_android_provider_Settings__get_DATA_ROAMING_ = 172; - public static final int SEEMP_API_android_provider_Settings__get_HTTP_PROXY_ = 173; - public static final int SEEMP_API_android_provider_Settings__get_PARENTAL_CONTROL_ENABLED_ = 174; - public static final int SEEMP_API_android_provider_Settings__get_PARENTAL_CONTROL_LAST_UPDATE_ = 175; - public static final int SEEMP_API_android_provider_Settings__get_PARENTAL_CONTROL_REDIRECT_URL_ = 176; - public static final int SEEMP_API_android_provider_Settings__get_RADIO_BLUETOOTH_ = 177; - public static final int SEEMP_API_android_provider_Settings__get_RADIO_CELL_ = 178; - public static final int SEEMP_API_android_provider_Settings__get_RADIO_NFC_ = 179; - public static final int SEEMP_API_android_provider_Settings__get_RADIO_WIFI_ = 180; - public static final int SEEMP_API_android_provider_Settings__get_SYS_PROP_SETTING_VERSION_ = 181; - public static final int SEEMP_API_android_provider_Settings__get_SETTINGS_CLASSNAME_ = 182; - public static final int SEEMP_API_android_provider_Settings__get_TEXT_AUTO_CAPS_ = 183; - public static final int SEEMP_API_android_provider_Settings__get_TEXT_AUTO_PUNCTUATE_ = 184; - public static final int SEEMP_API_android_provider_Settings__get_TEXT_AUTO_REPLACE_ = 185; - public static final int SEEMP_API_android_provider_Settings__get_TEXT_SHOW_PASSWORD_ = 186; - public static final int SEEMP_API_android_provider_Settings__get_USB_MASS_STORAGE_ENABLED_ = 187; - public static final int SEEMP_API_android_provider_Settings__get_VIBRATE_ON_ = 188; - public static final int SEEMP_API_android_provider_Settings__get_HAPTIC_FEEDBACK_ENABLED_ = 189; - public static final int SEEMP_API_android_provider_Settings__get_VOLUME_ALARM_ = 190; - public static final int SEEMP_API_android_provider_Settings__get_VOLUME_BLUETOOTH_SCO_ = 191; - public static final int SEEMP_API_android_provider_Settings__get_VOLUME_MUSIC_ = 192; - public static final int SEEMP_API_android_provider_Settings__get_VOLUME_NOTIFICATION_ = 193; - public static final int SEEMP_API_android_provider_Settings__get_VOLUME_RING_ = 194; - public static final int SEEMP_API_android_provider_Settings__get_VOLUME_SYSTEM_ = 195; - public static final int SEEMP_API_android_provider_Settings__get_VOLUME_VOICE_ = 196; - public static final int SEEMP_API_android_provider_Settings__get_SOUND_EFFECTS_ENABLED_ = 197; - public static final int SEEMP_API_android_provider_Settings__get_MODE_RINGER_STREAMS_AFFECTED_ = 198; - public static final int SEEMP_API_android_provider_Settings__get_MUTE_STREAMS_AFFECTED_ = 199; - public static final int SEEMP_API_android_provider_Settings__get_NOTIFICATION_SOUND_ = 200; - public static final int SEEMP_API_android_provider_Settings__get_APPEND_FOR_LAST_AUDIBLE_ = 201; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_MAX_DHCP_RETRY_COUNT_ = 202; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS_ = 203; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON_ = 204; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY_ = 205; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_NUM_OPEN_NETWORKS_KEPT_ = 206; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_ON_ = 207; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_SLEEP_POLICY_ = 208; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_SLEEP_POLICY_DEFAULT_ = 209; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_SLEEP_POLICY_NEVER_ = 210; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED_ = 211; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_DNS1_ = 212; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_DNS2_ = 213; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_GATEWAY_ = 214; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_IP_ = 215; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_NETMASK_ = 216; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_USE_STATIC_IP_ = 217; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE_ = 218; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_AP_COUNT_ = 219; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS_ = 220; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED_ = 221; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS_ = 222; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT_ = 223; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_MAX_AP_CHECKS_ = 224; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_ON_ = 225; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_PING_COUNT_ = 226; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_PING_DELAY_MS_ = 227; - public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_PING_TIMEOUT_MS_ = 228; - public static final int SEEMP_API_android_provider_Settings__put_ACCELEROMETER_ROTATION_ = 229; - public static final int SEEMP_API_android_provider_Settings__put_USER_ROTATION_ = 230; - public static final int SEEMP_API_android_provider_Settings__put_ADB_ENABLED_ = 231; - public static final int SEEMP_API_android_provider_Settings__put_DEBUG_APP_ = 232; - public static final int SEEMP_API_android_provider_Settings__put_WAIT_FOR_DEBUGGER_ = 233; - public static final int SEEMP_API_android_provider_Settings__put_AIRPLANE_MODE_ON_ = 234; - public static final int SEEMP_API_android_provider_Settings__put_AIRPLANE_MODE_RADIOS_ = 235; - public static final int SEEMP_API_android_provider_Settings__put_ALARM_ALERT_ = 236; - public static final int SEEMP_API_android_provider_Settings__put_NEXT_ALARM_FORMATTED_ = 237; - public static final int SEEMP_API_android_provider_Settings__put_ALWAYS_FINISH_ACTIVITIES_ = 238; - public static final int SEEMP_API_android_provider_Settings__put_ANDROID_ID_ = 239; - public static final int SEEMP_API_android_provider_Settings__put_LOGGING_ID_ = 240; - public static final int SEEMP_API_android_provider_Settings__put_ANIMATOR_DURATION_SCALE_ = 241; - public static final int SEEMP_API_android_provider_Settings__put_WINDOW_ANIMATION_SCALE_ = 242; - public static final int SEEMP_API_android_provider_Settings__put_FONT_SCALE_ = 243; - public static final int SEEMP_API_android_provider_Settings__put_SCREEN_BRIGHTNESS_ = 244; - public static final int SEEMP_API_android_provider_Settings__put_SCREEN_BRIGHTNESS_MODE_ = 245; - public static final int SEEMP_API_android_provider_Settings__put_SCREEN_BRIGHTNESS_MODE_AUTOMATIC_ = 246; - public static final int SEEMP_API_android_provider_Settings__put_SCREEN_BRIGHTNESS_MODE_MANUAL_ = 247; - public static final int SEEMP_API_android_provider_Settings__put_SCREEN_OFF_TIMEOUT_ = 248; - public static final int SEEMP_API_android_provider_Settings__put_DIM_SCREEN_ = 249; - public static final int SEEMP_API_android_provider_Settings__put_TRANSITION_ANIMATION_SCALE_ = 250; - public static final int SEEMP_API_android_provider_Settings__put_STAY_ON_WHILE_PLUGGED_IN_ = 251; - public static final int SEEMP_API_android_provider_Settings__put_WALLPAPER_ACTIVITY_ = 252; - public static final int SEEMP_API_android_provider_Settings__put_SHOW_PROCESSES_ = 253; - public static final int SEEMP_API_android_provider_Settings__put_SHOW_WEB_SUGGESTIONS_ = 254; - public static final int SEEMP_API_android_provider_Settings__put_SHOW_GTALK_SERVICE_STATUS_ = 255; - public static final int SEEMP_API_android_provider_Settings__put_USE_GOOGLE_MAIL_ = 256; - public static final int SEEMP_API_android_provider_Settings__put_AUTO_TIME_ = 257; - public static final int SEEMP_API_android_provider_Settings__put_AUTO_TIME_ZONE_ = 258; - public static final int SEEMP_API_android_provider_Settings__put_DATE_FORMAT_ = 259; - public static final int SEEMP_API_android_provider_Settings__put_TIME_12_24_ = 260; - public static final int SEEMP_API_android_provider_Settings__put_BLUETOOTH_DISCOVERABILITY_ = 261; - public static final int SEEMP_API_android_provider_Settings__put_BLUETOOTH_DISCOVERABILITY_TIMEOUT_ = 262; - public static final int SEEMP_API_android_provider_Settings__put_BLUETOOTH_ON_ = 263; - public static final int SEEMP_API_android_provider_Settings__put_DEVICE_PROVISIONED_ = 264; - public static final int SEEMP_API_android_provider_Settings__put_SETUP_WIZARD_HAS_RUN_ = 265; - public static final int SEEMP_API_android_provider_Settings__put_DTMF_TONE_WHEN_DIALING_ = 266; - public static final int SEEMP_API_android_provider_Settings__put_END_BUTTON_BEHAVIOR_ = 267; - public static final int SEEMP_API_android_provider_Settings__put_RINGTONE_ = 268; - public static final int SEEMP_API_android_provider_Settings__put_MODE_RINGER_ = 269; - public static final int SEEMP_API_android_provider_Settings__put_INSTALL_NON_MARKET_APPS_ = 270; - public static final int SEEMP_API_android_provider_Settings__put_LOCATION_PROVIDERS_ALLOWED_ = 271; - public static final int SEEMP_API_android_provider_Settings__put_LOCK_PATTERN_ENABLED_ = 272; - public static final int SEEMP_API_android_provider_Settings__put_LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED_ = 273; - public static final int SEEMP_API_android_provider_Settings__put_LOCK_PATTERN_VISIBLE_ = 274; - public static final int SEEMP_API_android_provider_Settings__put_NETWORK_PREFERENCE_ = 275; - public static final int SEEMP_API_android_provider_Settings__put_DATA_ROAMING_ = 276; - public static final int SEEMP_API_android_provider_Settings__put_HTTP_PROXY_ = 277; - public static final int SEEMP_API_android_provider_Settings__put_PARENTAL_CONTROL_ENABLED_ = 278; - public static final int SEEMP_API_android_provider_Settings__put_PARENTAL_CONTROL_LAST_UPDATE_ = 279; - public static final int SEEMP_API_android_provider_Settings__put_PARENTAL_CONTROL_REDIRECT_URL_ = 280; - public static final int SEEMP_API_android_provider_Settings__put_RADIO_BLUETOOTH_ = 281; - public static final int SEEMP_API_android_provider_Settings__put_RADIO_CELL_ = 282; - public static final int SEEMP_API_android_provider_Settings__put_RADIO_NFC_ = 283; - public static final int SEEMP_API_android_provider_Settings__put_RADIO_WIFI_ = 284; - public static final int SEEMP_API_android_provider_Settings__put_SYS_PROP_SETTING_VERSION_ = 285; - public static final int SEEMP_API_android_provider_Settings__put_SETTINGS_CLASSNAME_ = 286; - public static final int SEEMP_API_android_provider_Settings__put_TEXT_AUTO_CAPS_ = 287; - public static final int SEEMP_API_android_provider_Settings__put_TEXT_AUTO_PUNCTUATE_ = 288; - public static final int SEEMP_API_android_provider_Settings__put_TEXT_AUTO_REPLACE_ = 289; - public static final int SEEMP_API_android_provider_Settings__put_TEXT_SHOW_PASSWORD_ = 290; - public static final int SEEMP_API_android_provider_Settings__put_USB_MASS_STORAGE_ENABLED_ = 291; - public static final int SEEMP_API_android_provider_Settings__put_VIBRATE_ON_ = 292; - public static final int SEEMP_API_android_provider_Settings__put_HAPTIC_FEEDBACK_ENABLED_ = 293; - public static final int SEEMP_API_android_provider_Settings__put_VOLUME_ALARM_ = 294; - public static final int SEEMP_API_android_provider_Settings__put_VOLUME_BLUETOOTH_SCO_ = 295; - public static final int SEEMP_API_android_provider_Settings__put_VOLUME_MUSIC_ = 296; - public static final int SEEMP_API_android_provider_Settings__put_VOLUME_NOTIFICATION_ = 297; - public static final int SEEMP_API_android_provider_Settings__put_VOLUME_RING_ = 298; - public static final int SEEMP_API_android_provider_Settings__put_VOLUME_SYSTEM_ = 299; - public static final int SEEMP_API_android_provider_Settings__put_VOLUME_VOICE_ = 300; - public static final int SEEMP_API_android_provider_Settings__put_SOUND_EFFECTS_ENABLED_ = 301; - public static final int SEEMP_API_android_provider_Settings__put_MODE_RINGER_STREAMS_AFFECTED_ = 302; - public static final int SEEMP_API_android_provider_Settings__put_MUTE_STREAMS_AFFECTED_ = 303; - public static final int SEEMP_API_android_provider_Settings__put_NOTIFICATION_SOUND_ = 304; - public static final int SEEMP_API_android_provider_Settings__put_APPEND_FOR_LAST_AUDIBLE_ = 305; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_MAX_DHCP_RETRY_COUNT_ = 306; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS_ = 307; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON_ = 308; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY_ = 309; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_NUM_OPEN_NETWORKS_KEPT_ = 310; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_ON_ = 311; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_SLEEP_POLICY_ = 312; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_SLEEP_POLICY_DEFAULT_ = 313; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_SLEEP_POLICY_NEVER_ = 314; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED_ = 315; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_DNS1_ = 316; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_DNS2_ = 317; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_GATEWAY_ = 318; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_IP_ = 319; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_NETMASK_ = 320; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_USE_STATIC_IP_ = 321; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE_ = 322; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_AP_COUNT_ = 323; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS_ = 324; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED_ = 325; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS_ = 326; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT_ = 327; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_MAX_AP_CHECKS_ = 328; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_ON_ = 329; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_PING_COUNT_ = 330; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_PING_DELAY_MS_ = 331; - public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_PING_TIMEOUT_MS_ = 332; + public static final int SEEMP_API_android_provider_Settings__get_ANDROID_ID_ = 7; + public static final int SEEMP_API_android_provider_Settings__get_ACCELEROMETER_ROTATION_ = 96; + public static final int SEEMP_API_android_provider_Settings__get_USER_ROTATION_ = 97; + public static final int SEEMP_API_android_provider_Settings__get_ADB_ENABLED_ = 98; + public static final int SEEMP_API_android_provider_Settings__get_DEBUG_APP_ = 99; + public static final int SEEMP_API_android_provider_Settings__get_WAIT_FOR_DEBUGGER_ = 100; + public static final int SEEMP_API_android_provider_Settings__get_AIRPLANE_MODE_ON_ = 101; + public static final int SEEMP_API_android_provider_Settings__get_AIRPLANE_MODE_RADIOS_ = 102; + public static final int SEEMP_API_android_provider_Settings__get_ALARM_ALERT_ = 103; + public static final int SEEMP_API_android_provider_Settings__get_NEXT_ALARM_FORMATTED_ = 104; + public static final int SEEMP_API_android_provider_Settings__get_ALWAYS_FINISH_ACTIVITIES_ = 105; + public static final int SEEMP_API_android_provider_Settings__get_LOGGING_ID_ = 106; + public static final int SEEMP_API_android_provider_Settings__get_ANIMATOR_DURATION_SCALE_ = 107; + public static final int SEEMP_API_android_provider_Settings__get_WINDOW_ANIMATION_SCALE_ = 108; + public static final int SEEMP_API_android_provider_Settings__get_FONT_SCALE_ = 109; + public static final int SEEMP_API_android_provider_Settings__get_SCREEN_BRIGHTNESS_ = 110; + public static final int SEEMP_API_android_provider_Settings__get_SCREEN_BRIGHTNESS_MODE_ = 111; + public static final int SEEMP_API_android_provider_Settings__get_SCREEN_BRIGHTNESS_MODE_AUTOMATIC_ = 112; + public static final int SEEMP_API_android_provider_Settings__get_SCREEN_BRIGHTNESS_MODE_MANUAL_ = 113; + public static final int SEEMP_API_android_provider_Settings__get_SCREEN_OFF_TIMEOUT_ = 114; + public static final int SEEMP_API_android_provider_Settings__get_DIM_SCREEN_ = 115; + public static final int SEEMP_API_android_provider_Settings__get_TRANSITION_ANIMATION_SCALE_ = 116; + public static final int SEEMP_API_android_provider_Settings__get_STAY_ON_WHILE_PLUGGED_IN_ = 117; + public static final int SEEMP_API_android_provider_Settings__get_WALLPAPER_ACTIVITY_ = 118; + public static final int SEEMP_API_android_provider_Settings__get_SHOW_PROCESSES_ = 119; + public static final int SEEMP_API_android_provider_Settings__get_SHOW_WEB_SUGGESTIONS_ = 120; + public static final int SEEMP_API_android_provider_Settings__get_SHOW_GTALK_SERVICE_STATUS_ = 121; + public static final int SEEMP_API_android_provider_Settings__get_USE_GOOGLE_MAIL_ = 122; + public static final int SEEMP_API_android_provider_Settings__get_AUTO_TIME_ = 123; + public static final int SEEMP_API_android_provider_Settings__get_AUTO_TIME_ZONE_ = 124; + public static final int SEEMP_API_android_provider_Settings__get_DATE_FORMAT_ = 125; + public static final int SEEMP_API_android_provider_Settings__get_TIME_12_24_ = 126; + public static final int SEEMP_API_android_provider_Settings__get_BLUETOOTH_DISCOVERABILITY_ = 127; + public static final int SEEMP_API_android_provider_Settings__get_BLUETOOTH_DISCOVERABILITY_TIMEOUT_ = 128; + public static final int SEEMP_API_android_provider_Settings__get_BLUETOOTH_ON_ = 129; + public static final int SEEMP_API_android_provider_Settings__get_DEVICE_PROVISIONED_ = 130; + public static final int SEEMP_API_android_provider_Settings__get_SETUP_WIZARD_HAS_RUN_ = 131; + public static final int SEEMP_API_android_provider_Settings__get_DTMF_TONE_WHEN_DIALING_ = 132; + public static final int SEEMP_API_android_provider_Settings__get_END_BUTTON_BEHAVIOR_ = 133; + public static final int SEEMP_API_android_provider_Settings__get_RINGTONE_ = 134; + public static final int SEEMP_API_android_provider_Settings__get_MODE_RINGER_ = 135; + public static final int SEEMP_API_android_provider_Settings__get_INSTALL_NON_MARKET_APPS_ = 136; + public static final int SEEMP_API_android_provider_Settings__get_LOCATION_PROVIDERS_ALLOWED_ = 137; + public static final int SEEMP_API_android_provider_Settings__get_LOCK_PATTERN_ENABLED_ = 138; + public static final int SEEMP_API_android_provider_Settings__get_LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED_ = 139; + public static final int SEEMP_API_android_provider_Settings__get_LOCK_PATTERN_VISIBLE_ = 140; + public static final int SEEMP_API_android_provider_Settings__get_NETWORK_PREFERENCE_ = 141; + public static final int SEEMP_API_android_provider_Settings__get_DATA_ROAMING_ = 142; + public static final int SEEMP_API_android_provider_Settings__get_HTTP_PROXY_ = 143; + public static final int SEEMP_API_android_provider_Settings__get_PARENTAL_CONTROL_ENABLED_ = 144; + public static final int SEEMP_API_android_provider_Settings__get_PARENTAL_CONTROL_LAST_UPDATE_ = 145; + public static final int SEEMP_API_android_provider_Settings__get_PARENTAL_CONTROL_REDIRECT_URL_ = 146; + public static final int SEEMP_API_android_provider_Settings__get_RADIO_BLUETOOTH_ = 147; + public static final int SEEMP_API_android_provider_Settings__get_RADIO_CELL_ = 148; + public static final int SEEMP_API_android_provider_Settings__get_RADIO_NFC_ = 149; + public static final int SEEMP_API_android_provider_Settings__get_RADIO_WIFI_ = 150; + public static final int SEEMP_API_android_provider_Settings__get_SYS_PROP_SETTING_VERSION_ = 151; + public static final int SEEMP_API_android_provider_Settings__get_SETTINGS_CLASSNAME_ = 152; + public static final int SEEMP_API_android_provider_Settings__get_TEXT_AUTO_CAPS_ = 153; + public static final int SEEMP_API_android_provider_Settings__get_TEXT_AUTO_PUNCTUATE_ = 154; + public static final int SEEMP_API_android_provider_Settings__get_TEXT_AUTO_REPLACE_ = 155; + public static final int SEEMP_API_android_provider_Settings__get_TEXT_SHOW_PASSWORD_ = 156; + public static final int SEEMP_API_android_provider_Settings__get_USB_MASS_STORAGE_ENABLED_ = 157; + public static final int SEEMP_API_android_provider_Settings__get_VIBRATE_ON_ = 158; + public static final int SEEMP_API_android_provider_Settings__get_HAPTIC_FEEDBACK_ENABLED_ = 159; + public static final int SEEMP_API_android_provider_Settings__get_VOLUME_ALARM_ = 160; + public static final int SEEMP_API_android_provider_Settings__get_VOLUME_BLUETOOTH_SCO_ = 161; + public static final int SEEMP_API_android_provider_Settings__get_VOLUME_MUSIC_ = 162; + public static final int SEEMP_API_android_provider_Settings__get_VOLUME_NOTIFICATION_ = 163; + public static final int SEEMP_API_android_provider_Settings__get_VOLUME_RING_ = 164; + public static final int SEEMP_API_android_provider_Settings__get_VOLUME_SYSTEM_ = 165; + public static final int SEEMP_API_android_provider_Settings__get_VOLUME_VOICE_ = 166; + public static final int SEEMP_API_android_provider_Settings__get_SOUND_EFFECTS_ENABLED_ = 167; + public static final int SEEMP_API_android_provider_Settings__get_MODE_RINGER_STREAMS_AFFECTED_ = 168; + public static final int SEEMP_API_android_provider_Settings__get_MUTE_STREAMS_AFFECTED_ = 169; + public static final int SEEMP_API_android_provider_Settings__get_NOTIFICATION_SOUND_ = 170; + public static final int SEEMP_API_android_provider_Settings__get_APPEND_FOR_LAST_AUDIBLE_ = 171; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_MAX_DHCP_RETRY_COUNT_ = 172; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS_ = 173; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON_ = 174; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY_ = 175; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_NUM_OPEN_NETWORKS_KEPT_ = 176; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_ON_ = 177; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_SLEEP_POLICY_ = 178; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_SLEEP_POLICY_DEFAULT_ = 179; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_SLEEP_POLICY_NEVER_ = 180; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED_ = 181; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_DNS1_ = 182; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_DNS2_ = 183; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_GATEWAY_ = 184; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_IP_ = 185; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_STATIC_NETMASK_ = 186; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_USE_STATIC_IP_ = 187; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE_ = 188; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_AP_COUNT_ = 189; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS_ = 190; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED_ = 191; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS_ = 192; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT_ = 193; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_MAX_AP_CHECKS_ = 194; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_ON_ = 195; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_PING_COUNT_ = 196; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_PING_DELAY_MS_ = 197; + public static final int SEEMP_API_android_provider_Settings__get_WIFI_WATCHDOG_PING_TIMEOUT_MS_ = 198; + public static final int SEEMP_API_android_provider_Settings__put_ACCELEROMETER_ROTATION_ = 199; + public static final int SEEMP_API_android_provider_Settings__put_USER_ROTATION_ = 200; + public static final int SEEMP_API_android_provider_Settings__put_ADB_ENABLED_ = 201; + public static final int SEEMP_API_android_provider_Settings__put_DEBUG_APP_ = 202; + public static final int SEEMP_API_android_provider_Settings__put_WAIT_FOR_DEBUGGER_ = 203; + public static final int SEEMP_API_android_provider_Settings__put_AIRPLANE_MODE_ON_ = 204; + public static final int SEEMP_API_android_provider_Settings__put_AIRPLANE_MODE_RADIOS_ = 205; + public static final int SEEMP_API_android_provider_Settings__put_ALARM_ALERT_ = 206; + public static final int SEEMP_API_android_provider_Settings__put_NEXT_ALARM_FORMATTED_ = 207; + public static final int SEEMP_API_android_provider_Settings__put_ALWAYS_FINISH_ACTIVITIES_ = 208; + public static final int SEEMP_API_android_provider_Settings__put_ANDROID_ID_ = 209; + public static final int SEEMP_API_android_provider_Settings__put_LOGGING_ID_ = 210; + public static final int SEEMP_API_android_provider_Settings__put_ANIMATOR_DURATION_SCALE_ = 211; + public static final int SEEMP_API_android_provider_Settings__put_WINDOW_ANIMATION_SCALE_ = 212; + public static final int SEEMP_API_android_provider_Settings__put_FONT_SCALE_ = 213; + public static final int SEEMP_API_android_provider_Settings__put_SCREEN_BRIGHTNESS_ = 214; + public static final int SEEMP_API_android_provider_Settings__put_SCREEN_BRIGHTNESS_MODE_ = 215; + public static final int SEEMP_API_android_provider_Settings__put_SCREEN_BRIGHTNESS_MODE_AUTOMATIC_ = 216; + public static final int SEEMP_API_android_provider_Settings__put_SCREEN_BRIGHTNESS_MODE_MANUAL_ = 217; + public static final int SEEMP_API_android_provider_Settings__put_SCREEN_OFF_TIMEOUT_ = 218; + public static final int SEEMP_API_android_provider_Settings__put_DIM_SCREEN_ = 219; + public static final int SEEMP_API_android_provider_Settings__put_TRANSITION_ANIMATION_SCALE_ = 220; + public static final int SEEMP_API_android_provider_Settings__put_STAY_ON_WHILE_PLUGGED_IN_ = 221; + public static final int SEEMP_API_android_provider_Settings__put_WALLPAPER_ACTIVITY_ = 222; + public static final int SEEMP_API_android_provider_Settings__put_SHOW_PROCESSES_ = 223; + public static final int SEEMP_API_android_provider_Settings__put_SHOW_WEB_SUGGESTIONS_ = 224; + public static final int SEEMP_API_android_provider_Settings__put_SHOW_GTALK_SERVICE_STATUS_ = 225; + public static final int SEEMP_API_android_provider_Settings__put_USE_GOOGLE_MAIL_ = 226; + public static final int SEEMP_API_android_provider_Settings__put_AUTO_TIME_ = 227; + public static final int SEEMP_API_android_provider_Settings__put_AUTO_TIME_ZONE_ = 228; + public static final int SEEMP_API_android_provider_Settings__put_DATE_FORMAT_ = 229; + public static final int SEEMP_API_android_provider_Settings__put_TIME_12_24_ = 230; + public static final int SEEMP_API_android_provider_Settings__put_BLUETOOTH_DISCOVERABILITY_ = 231; + public static final int SEEMP_API_android_provider_Settings__put_BLUETOOTH_DISCOVERABILITY_TIMEOUT_ = 232; + public static final int SEEMP_API_android_provider_Settings__put_BLUETOOTH_ON_ = 233; + public static final int SEEMP_API_android_provider_Settings__put_DEVICE_PROVISIONED_ = 234; + public static final int SEEMP_API_android_provider_Settings__put_SETUP_WIZARD_HAS_RUN_ = 235; + public static final int SEEMP_API_android_provider_Settings__put_DTMF_TONE_WHEN_DIALING_ = 236; + public static final int SEEMP_API_android_provider_Settings__put_END_BUTTON_BEHAVIOR_ = 237; + public static final int SEEMP_API_android_provider_Settings__put_RINGTONE_ = 238; + public static final int SEEMP_API_android_provider_Settings__put_MODE_RINGER_ = 239; + public static final int SEEMP_API_android_provider_Settings__put_INSTALL_NON_MARKET_APPS_ = 240; + public static final int SEEMP_API_android_provider_Settings__put_LOCATION_PROVIDERS_ALLOWED_ = 241; + public static final int SEEMP_API_android_provider_Settings__put_LOCK_PATTERN_ENABLED_ = 242; + public static final int SEEMP_API_android_provider_Settings__put_LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED_ = 243; + public static final int SEEMP_API_android_provider_Settings__put_LOCK_PATTERN_VISIBLE_ = 244; + public static final int SEEMP_API_android_provider_Settings__put_NETWORK_PREFERENCE_ = 245; + public static final int SEEMP_API_android_provider_Settings__put_DATA_ROAMING_ = 246; + public static final int SEEMP_API_android_provider_Settings__put_HTTP_PROXY_ = 247; + public static final int SEEMP_API_android_provider_Settings__put_PARENTAL_CONTROL_ENABLED_ = 248; + public static final int SEEMP_API_android_provider_Settings__put_PARENTAL_CONTROL_LAST_UPDATE_ = 249; + public static final int SEEMP_API_android_provider_Settings__put_PARENTAL_CONTROL_REDIRECT_URL_ = 250; + public static final int SEEMP_API_android_provider_Settings__put_RADIO_BLUETOOTH_ = 251; + public static final int SEEMP_API_android_provider_Settings__put_RADIO_CELL_ = 252; + public static final int SEEMP_API_android_provider_Settings__put_RADIO_NFC_ = 253; + public static final int SEEMP_API_android_provider_Settings__put_RADIO_WIFI_ = 254; + public static final int SEEMP_API_android_provider_Settings__put_SYS_PROP_SETTING_VERSION_ = 255; + public static final int SEEMP_API_android_provider_Settings__put_SETTINGS_CLASSNAME_ = 256; + public static final int SEEMP_API_android_provider_Settings__put_TEXT_AUTO_CAPS_ = 257; + public static final int SEEMP_API_android_provider_Settings__put_TEXT_AUTO_PUNCTUATE_ = 258; + public static final int SEEMP_API_android_provider_Settings__put_TEXT_AUTO_REPLACE_ = 259; + public static final int SEEMP_API_android_provider_Settings__put_TEXT_SHOW_PASSWORD_ = 260; + public static final int SEEMP_API_android_provider_Settings__put_USB_MASS_STORAGE_ENABLED_ = 261; + public static final int SEEMP_API_android_provider_Settings__put_VIBRATE_ON_ = 262; + public static final int SEEMP_API_android_provider_Settings__put_HAPTIC_FEEDBACK_ENABLED_ = 263; + public static final int SEEMP_API_android_provider_Settings__put_VOLUME_ALARM_ = 264; + public static final int SEEMP_API_android_provider_Settings__put_VOLUME_BLUETOOTH_SCO_ = 265; + public static final int SEEMP_API_android_provider_Settings__put_VOLUME_MUSIC_ = 266; + public static final int SEEMP_API_android_provider_Settings__put_VOLUME_NOTIFICATION_ = 267; + public static final int SEEMP_API_android_provider_Settings__put_VOLUME_RING_ = 268; + public static final int SEEMP_API_android_provider_Settings__put_VOLUME_SYSTEM_ = 269; + public static final int SEEMP_API_android_provider_Settings__put_VOLUME_VOICE_ = 270; + public static final int SEEMP_API_android_provider_Settings__put_SOUND_EFFECTS_ENABLED_ = 271; + public static final int SEEMP_API_android_provider_Settings__put_MODE_RINGER_STREAMS_AFFECTED_ = 272; + public static final int SEEMP_API_android_provider_Settings__put_MUTE_STREAMS_AFFECTED_ = 273; + public static final int SEEMP_API_android_provider_Settings__put_NOTIFICATION_SOUND_ = 274; + public static final int SEEMP_API_android_provider_Settings__put_APPEND_FOR_LAST_AUDIBLE_ = 275; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_MAX_DHCP_RETRY_COUNT_ = 276; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS_ = 277; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON_ = 278; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY_ = 279; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_NUM_OPEN_NETWORKS_KEPT_ = 280; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_ON_ = 281; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_SLEEP_POLICY_ = 282; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_SLEEP_POLICY_DEFAULT_ = 283; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_SLEEP_POLICY_NEVER_ = 284; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED_ = 285; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_DNS1_ = 286; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_DNS2_ = 287; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_GATEWAY_ = 288; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_IP_ = 289; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_STATIC_NETMASK_ = 290; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_USE_STATIC_IP_ = 291; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_ACCEPTABLE_PACKET_LOSS_PERCENTAGE_ = 292; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_AP_COUNT_ = 293; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_BACKGROUND_CHECK_DELAY_MS_ = 294; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_BACKGROUND_CHECK_ENABLED_ = 295; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_BACKGROUND_CHECK_TIMEOUT_MS_ = 296; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_INITIAL_IGNORED_PING_COUNT_ = 297; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_MAX_AP_CHECKS_ = 298; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_ON_ = 299; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_PING_COUNT_ = 300; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_PING_DELAY_MS_ = 301; + public static final int SEEMP_API_android_provider_Settings__put_WIFI_WATCHDOG_PING_TIMEOUT_MS_ = 302; private final static java.util.Map<String,Integer> value_to_get_map; static { diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java index d27edf7..95e291c 100644 --- a/core/java/android/view/WindowManagerImpl.java +++ b/core/java/android/view/WindowManagerImpl.java @@ -81,14 +81,14 @@ public final class WindowManagerImpl implements WindowManager { @Override public void addView(@NonNull View view, @NonNull ViewGroup.LayoutParams params) { - android.util.SeempLog.record_vg_layout(413,params); + android.util.SeempLog.record_vg_layout(383,params); applyDefaultToken(params); mGlobal.addView(view, params, mDisplay, mParentWindow); } @Override public void updateViewLayout(@NonNull View view, @NonNull ViewGroup.LayoutParams params) { - android.util.SeempLog.record_vg_layout(414,params); + android.util.SeempLog.record_vg_layout(384,params); applyDefaultToken(params); mGlobal.updateViewLayout(view, params); } diff --git a/core/java/android/webkit/WebChromeClient.java b/core/java/android/webkit/WebChromeClient.java index fcb60b5..01fcc1a 100644 --- a/core/java/android/webkit/WebChromeClient.java +++ b/core/java/android/webkit/WebChromeClient.java @@ -291,7 +291,7 @@ public class WebChromeClient { */ public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) { - android.util.SeempLog.record(71); + android.util.SeempLog.record(54); } /** diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index fd7e85c..4544814 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -348,7 +348,6 @@ public class LocationManager { * @return list of Strings containing names of the providers */ public List<String> getProviders(boolean enabledOnly) { - android.util.SeempLog.record(62); try { return mService.getProviders(null, enabledOnly); } catch (RemoteException e) { @@ -369,7 +368,6 @@ public class LocationManager { * given provider. */ public LocationProvider getProvider(String name) { - android.util.SeempLog.record(61); checkProvider(name); try { ProviderProperties properties = mService.getProviderProperties(name); @@ -394,7 +392,6 @@ public class LocationManager { * @return list of Strings containing names of the providers */ public List<String> getProviders(Criteria criteria, boolean enabledOnly) { - android.util.SeempLog.record(62); checkCriteria(criteria); try { return mService.getProviders(criteria, enabledOnly); @@ -427,7 +424,6 @@ public class LocationManager { * @return name of the provider that best matches the requirements */ public String getBestProvider(Criteria criteria, boolean enabledOnly) { - android.util.SeempLog.record(59); checkCriteria(criteria); try { return mService.getBestProvider(criteria, enabledOnly); @@ -460,7 +456,7 @@ public class LocationManager { @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates(String provider, long minTime, float minDistance, LocationListener listener) { - android.util.SeempLog.record(64); + android.util.SeempLog.record(47); checkProvider(provider); checkListener(listener); @@ -493,7 +489,7 @@ public class LocationManager { @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates(String provider, long minTime, float minDistance, LocationListener listener, Looper looper) { - android.util.SeempLog.record(64); + android.util.SeempLog.record(47); checkProvider(provider); checkListener(listener); @@ -527,7 +523,7 @@ public class LocationManager { @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates(long minTime, float minDistance, Criteria criteria, LocationListener listener, Looper looper) { - android.util.SeempLog.record(64); + android.util.SeempLog.record(47); checkCriteria(criteria); checkListener(listener); @@ -556,7 +552,7 @@ public class LocationManager { @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates(String provider, long minTime, float minDistance, PendingIntent intent) { - android.util.SeempLog.record(64); + android.util.SeempLog.record(47); checkProvider(provider); checkPendingIntent(intent); @@ -659,7 +655,7 @@ public class LocationManager { @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void requestLocationUpdates(long minTime, float minDistance, Criteria criteria, PendingIntent intent) { - android.util.SeempLog.record(64); + android.util.SeempLog.record(47); checkCriteria(criteria); checkPendingIntent(intent); @@ -838,7 +834,7 @@ public class LocationManager { @SystemApi public void requestLocationUpdates(LocationRequest request, LocationListener listener, Looper looper) { - android.util.SeempLog.record(64); + android.util.SeempLog.record(47); checkListener(listener); requestLocationUpdates(request, listener, looper, null); } @@ -866,7 +862,7 @@ public class LocationManager { */ @SystemApi public void requestLocationUpdates(LocationRequest request, PendingIntent intent) { - android.util.SeempLog.record(64); + android.util.SeempLog.record(47); checkPendingIntent(intent); requestLocationUpdates(request, null, null, intent); } @@ -885,7 +881,7 @@ public class LocationManager { private void requestLocationUpdates(LocationRequest request, LocationListener listener, Looper looper, PendingIntent intent) { - android.util.SeempLog.record(64); + android.util.SeempLog.record(47); String packageName = mContext.getPackageName(); @@ -994,7 +990,7 @@ public class LocationManager { @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public void addProximityAlert(double latitude, double longitude, float radius, long expiration, PendingIntent intent) { - android.util.SeempLog.record(58); + android.util.SeempLog.record(45); checkPendingIntent(intent); if (expiration < 0) expiration = Long.MAX_VALUE; @@ -1154,7 +1150,6 @@ public class LocationManager { * @throws IllegalArgumentException if provider is null */ public boolean isProviderEnabled(String provider) { - android.util.SeempLog.record(63); checkProvider(provider); try { @@ -1209,7 +1204,7 @@ public class LocationManager { */ @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) public Location getLastKnownLocation(String provider) { - android.util.SeempLog.record(60); + android.util.SeempLog.record(46); checkProvider(provider); String packageName = mContext.getPackageName(); LocationRequest request = LocationRequest.createFromDeprecatedProvider( @@ -1530,7 +1525,7 @@ public class LocationManager { */ @RequiresPermission(ACCESS_FINE_LOCATION) public boolean addGpsStatusListener(GpsStatus.Listener listener) { - android.util.SeempLog.record(56); + android.util.SeempLog.record(43); boolean result; if (mGpsStatusListeners.get(listener) != null) { @@ -1578,7 +1573,7 @@ public class LocationManager { */ @RequiresPermission(ACCESS_FINE_LOCATION) public boolean addNmeaListener(GpsStatus.NmeaListener listener) { - android.util.SeempLog.record(57); + android.util.SeempLog.record(44); boolean result; if (mNmeaListeners.get(listener) != null) { @@ -1697,7 +1692,7 @@ public class LocationManager { * @return true if the command succeeds. */ public boolean sendExtraCommand(String provider, String command, Bundle extras) { - android.util.SeempLog.record(65); + android.util.SeempLog.record(48); try { return mService.sendExtraCommand(provider, command, extras); } catch (RemoteException e) { diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index c1ca2b0..e819b8a 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -890,7 +890,7 @@ public class AudioRecord */ public void startRecording() throws IllegalStateException { - android.util.SeempLog.record(88); + android.util.SeempLog.record(70); if (mState != STATE_INITIALIZED) { throw new IllegalStateException("startRecording() called on an " + "uninitialized AudioRecord."); @@ -919,7 +919,7 @@ public class AudioRecord */ public void startRecording(MediaSyncEvent syncEvent) throws IllegalStateException { - android.util.SeempLog.record(88); + android.util.SeempLog.record(70); if (mState != STATE_INITIALIZED) { throw new IllegalStateException("startRecording() called on an " + "uninitialized AudioRecord."); @@ -940,7 +940,6 @@ public class AudioRecord */ public void stop() throws IllegalStateException { - android.util.SeempLog.record(90); if (mState != STATE_INITIALIZED) { throw new IllegalStateException("stop() called on an uninitialized AudioRecord."); } diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index 21061db..69da951 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -389,7 +389,6 @@ static void android_media_MediaRecorder_start(JNIEnv *env, jobject thiz) { ALOGV("start"); - SEEMPLOG_RECORD(86, ""); sp<MediaRecorder> mr = getMediaRecorder(env, thiz); process_media_recorder_call(env, mr->start(), "java/lang/RuntimeException", "start failed."); } diff --git a/native/android/Android.mk b/native/android/Android.mk index daee1f0..1742bee 100644 --- a/native/android/Android.mk +++ b/native/android/Android.mk @@ -27,7 +27,6 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libui \ libgui \ - libdl \ libandroid_runtime \ libnetd_client \ diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp index f2aba95..76c701a 100644 --- a/native/android/sensor.cpp +++ b/native/android/sensor.cpp @@ -29,7 +29,6 @@ #include <gui/SensorEventQueue.h> #include <poll.h> -#include "SeempLog.h" using android::sp; using android::Sensor; @@ -108,7 +107,6 @@ int ASensorManager_destroyEventQueue(ASensorManager* manager, int ASensorEventQueue_enableSensor(ASensorEventQueue* queue, ASensor const* sensor) { - SEEMPLOG_RECORD(108,""); return static_cast<SensorEventQueue*>(queue)->enableSensor( static_cast<Sensor const*>(sensor)); } diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 476dc16..edc3685 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -528,7 +528,7 @@ public class AccountManagerService @Override public String getPassword(Account account) { - android.util.SeempLog.record(17); + android.util.SeempLog.record(14); int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "getPassword: " + account @@ -628,7 +628,7 @@ public class AccountManagerService @Override public String getUserData(Account account, String key) { - android.util.SeempLog.record(18); + android.util.SeempLog.record(15); final int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { String msg = String.format("getUserData( account: %s, key: %s, callerUid: %s, pid: %s", @@ -1201,7 +1201,7 @@ public class AccountManagerService @Override public void removeAccount(IAccountManagerResponse response, Account account, boolean expectActivityLaunch) { - android.util.SeempLog.record(20); + android.util.SeempLog.record(17); removeAccountAsUser( response, account, @@ -1590,7 +1590,7 @@ public class AccountManagerService @Override public void setPassword(Account account, String password) { - android.util.SeempLog.record(21); + android.util.SeempLog.record(18); final int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "setAuthToken: " + account @@ -1655,7 +1655,7 @@ public class AccountManagerService @Override public void clearPassword(Account account) { - android.util.SeempLog.record(22); + android.util.SeempLog.record(19); final int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "clearPassword: " + account @@ -1682,7 +1682,7 @@ public class AccountManagerService @Override public void setUserData(Account account, String key, String value) { - android.util.SeempLog.record(23); + android.util.SeempLog.record(20); final int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "setUserData: " + account @@ -2122,7 +2122,7 @@ public class AccountManagerService public void addAccount(final IAccountManagerResponse response, final String accountType, final String authTokenType, final String[] requiredFeatures, final boolean expectActivityLaunch, final Bundle optionsIn) { - android.util.SeempLog.record(19); + android.util.SeempLog.record(16); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "addAccount: accountType " + accountType + ", response " + response @@ -2376,7 +2376,7 @@ public class AccountManagerService @Override public void editProperties(IAccountManagerResponse response, final String accountType, final boolean expectActivityLaunch) { - android.util.SeempLog.record(24); + android.util.SeempLog.record(21); final int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "editProperties: accountType " + accountType diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 5bac213..8872781 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -1,7 +1,7 @@ /* * Copyright (C) 2006-2008 The Android Open Source Project * This code has been modified. Portions copyright (C) 2010, T-Mobile USA, Inc. - * Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. + * Copyright (c) 2010-2015, The Linux Foundation. All rights reserved. * Not a Contribution. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18910,6 +18910,18 @@ public final class ActivityManagerService extends ActivityManagerNative boolean success = true; if (app.curRawAdj != app.setRawAdj) { + String seempStr = "app_uid=" + app.uid + + ",app_pid=" + app.pid + ",oom_adj=" + app.curAdj + + ",setAdj=" + app.setAdj + ",hasShownUi=" + (app.hasShownUi ? 1 : 0) + + ",cached=" + (app.cached ? 1 : 0) + + ",fA=" + (app.foregroundActivities ? 1 : 0) + + ",fS=" + (app.foregroundServices ? 1 : 0) + + ",systemNoUi=" + (app.systemNoUi ? 1 : 0) + + ",curSchedGroup=" + app.curSchedGroup + + ",curProcState=" + app.curProcState + ",setProcState=" + app.setProcState + + ",killed=" + (app.killed ? 1 : 0) + ",killedByAm=" + (app.killedByAm ? 1 : 0) + + ",debugging=" + (app.debugging ? 1 : 0); + android.util.SeempLog.record_str(385, seempStr); app.setRawAdj = app.curRawAdj; } diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index bd31a21..9c4c978 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -427,6 +427,18 @@ final class ProcessRecord { } public void makeActive(IApplicationThread _thread, ProcessStatsService tracker) { + String seempStr = "app_uid=" + uid + + ",app_pid=" + pid + ",oom_adj=" + curAdj + + ",setAdj=" + setAdj + ",hasShownUi=" + (hasShownUi ? 1 : 0) + + ",cached=" + (cached ? 1 : 0) + + ",fA=" + (foregroundActivities ? 1 : 0) + + ",fS=" + (foregroundServices ? 1 : 0) + + ",systemNoUi=" + (systemNoUi ? 1 : 0) + + ",curSchedGroup=" + curSchedGroup + + ",curProcState=" + curProcState + ",setProcState=" + setProcState + + ",killed=" + (killed ? 1 : 0) + ",killedByAm=" + (killedByAm ? 1 : 0) + + ",debugging=" + (debugging ? 1 : 0); + android.util.SeempLog.record_str(386, seempStr); if (thread == null) { final ProcessStats.ProcessState origBase = baseProcessTracker; if (origBase != null) { @@ -453,6 +465,18 @@ final class ProcessRecord { } public void makeInactive(ProcessStatsService tracker) { + String seempStr = "app_uid=" + uid + + ",app_pid=" + pid + ",oom_adj=" + curAdj + + ",setAdj=" + setAdj + ",hasShownUi=" + (hasShownUi ? 1 : 0) + + ",cached=" + (cached ? 1 : 0) + + ",fA=" + (foregroundActivities ? 1 : 0) + + ",fS=" + (foregroundServices ? 1 : 0) + + ",systemNoUi=" + (systemNoUi ? 1 : 0) + + ",curSchedGroup=" + curSchedGroup + + ",curProcState=" + curProcState + ",setProcState=" + setProcState + + ",killed=" + (killed ? 1 : 0) + ",killedByAm=" + (killedByAm ? 1 : 0) + + ",debugging=" + (debugging ? 1 : 0); + android.util.SeempLog.record_str(387, seempStr); thread = null; final ProcessStats.ProcessState origBase = baseProcessTracker; if (origBase != null) { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 9c21543..b899672 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -10174,7 +10174,7 @@ public class PackageManagerService extends IPackageManager.Stub { public void installPackage(String originPath, IPackageInstallObserver2 observer, int installFlags, String installerPackageName, VerificationParams verificationParams, String packageAbiOverride) { - android.util.SeempLog.record(113); + android.util.SeempLog.record(90); installPackageAsUser(originPath, observer, installFlags, installerPackageName, verificationParams, packageAbiOverride, UserHandle.getCallingUserId()); } diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 4b37cdb..5ee1fb2 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -200,7 +200,6 @@ public class PhoneNumberUtils * <code>null</code> if the number cannot be found. */ public static String getNumberFromIntent(Intent intent, Context context) { - android.util.SeempLog.record(12); String number = null; Uri uri = intent.getData(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 3dd6793..8342b29 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -706,7 +706,6 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} */ public String getDeviceId() { - android.util.SeempLog.record(9); try { ITelephony telephony = getITelephony(); if (telephony == null) @@ -729,7 +728,7 @@ public class TelephonyManager { * @param slotId of which deviceID is returned */ public String getDeviceId(int slotId) { - android.util.SeempLog.record(9); + android.util.SeempLog.record_str(8, ""+slotId); // FIXME this assumes phoneId == slotId try { IPhoneSubInfo info = getSubscriberInfo(); @@ -826,7 +825,7 @@ public class TelephonyManager { * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_FINE_LOCATION}. */ public CellLocation getCellLocation() { - android.util.SeempLog.record(66); + android.util.SeempLog.record(49); try { ITelephony telephony = getITelephony(); if (telephony == null) { @@ -924,7 +923,7 @@ public class TelephonyManager { */ @Deprecated public List<NeighboringCellInfo> getNeighboringCellInfo() { - android.util.SeempLog.record(67); + android.util.SeempLog.record(50); try { ITelephony telephony = getITelephony(); if (telephony == null) @@ -1976,7 +1975,6 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} */ public String getSimSerialNumber() { - android.util.SeempLog.record(10); return getSimSerialNumber(getDefaultSubscription()); } @@ -1990,7 +1988,7 @@ public class TelephonyManager { */ /** {@hide} */ public String getSimSerialNumber(int subId) { - android.util.SeempLog.record(10); + android.util.SeempLog.record_str(388, ""+subId); try { IPhoneSubInfo info = getSubscriberInfo(); if (info == null) @@ -2080,7 +2078,6 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} */ public String getSubscriberId() { - android.util.SeempLog.record(114); return getSubscriberId(getDefaultSubscription()); } @@ -2096,7 +2093,7 @@ public class TelephonyManager { */ /** {@hide} */ public String getSubscriberId(int subId) { - android.util.SeempLog.record(114); + android.util.SeempLog.record_str(389, ""+subId); try { IPhoneSubInfo info = getSubscriberInfo(); if (info == null) @@ -2167,7 +2164,6 @@ public class TelephonyManager { * The default SMS app can also use this. */ public String getLine1Number() { - android.util.SeempLog.record(11); return getLine1NumberForSubscriber(getDefaultSubscription()); } @@ -2186,6 +2182,7 @@ public class TelephonyManager { */ /** {@hide} */ public String getLine1NumberForSubscriber(int subId) { + android.util.SeempLog.record_str(9, ""+subId); String number = null; try { ITelephony telephony = getITelephony(); diff --git a/telephony/java/com/android/internal/telephony/CallerInfo.java b/telephony/java/com/android/internal/telephony/CallerInfo.java index 4e4ce5a..6e1a004 100644 --- a/telephony/java/com/android/internal/telephony/CallerInfo.java +++ b/telephony/java/com/android/internal/telephony/CallerInfo.java @@ -165,7 +165,7 @@ public class CallerInfo { * number. The returned CallerInfo is null if no number is supplied. */ public static CallerInfo getCallerInfo(Context context, Uri contactRef, Cursor cursor) { - android.util.SeempLog.record(15); + android.util.SeempLog.record_uri(12, contactRef); CallerInfo info = new CallerInfo(); info.photoResource = 0; info.phoneLabel = null; @@ -284,7 +284,6 @@ public class CallerInfo { * number. The returned CallerInfo is null if no number is supplied. */ public static CallerInfo getCallerInfo(Context context, Uri contactRef) { - android.util.SeempLog.record(15); CallerInfo info = null; ContentResolver cr = CallerInfoAsyncQuery.getCurrentProfileContentResolver(context); if (cr != null) { @@ -309,7 +308,6 @@ public class CallerInfo { * with all relevant fields empty or null. */ public static CallerInfo getCallerInfo(Context context, String number) { - android.util.SeempLog.record(15); if (VDBG) Rlog.v(TAG, "getCallerInfo() based on number..."); int subId = SubscriptionManager.getDefaultSubId(); @@ -328,7 +326,7 @@ public class CallerInfo { * with all relevant fields empty or null. */ public static CallerInfo getCallerInfo(Context context, String number, int subId) { - android.util.SeempLog.record(15); + android.util.SeempLog.record_str(12, "number="+number+",subId="+subId); if (TextUtils.isEmpty(number)) { return null; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java index 7e5ae8d..b23d87d 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/view/WindowManagerImpl.java @@ -45,6 +45,7 @@ public class WindowManagerImpl implements WindowManager { @Override public void addView(View arg0, android.view.ViewGroup.LayoutParams arg1) { + android.util.SeempLog.record_vg(383, arg1); // pass } @@ -55,6 +56,7 @@ public class WindowManagerImpl implements WindowManager { @Override public void updateViewLayout(View arg0, android.view.ViewGroup.LayoutParams arg1) { + android.util.SeempLog.record_vg(384, arg1); // pass } diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 46ae8d3..056ede1 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1313,7 +1313,7 @@ public class WifiManager { * in order to get valid results. */ public List<ScanResult> getScanResults() { - android.util.SeempLog.record(72); + android.util.SeempLog.record(55); try { return mService.getScanResults(mContext.getOpPackageName()); } catch (RemoteException e) { |