summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/content/pm/ServiceInfo.java2
-rw-r--r--core/res/res/drawable-hdpi/stat_sys_secure.pngbin761 -> 0 bytes
-rw-r--r--core/res/res/drawable-ldpi/stat_sys_secure.pngbin407 -> 0 bytes
-rw-r--r--core/res/res/drawable-mdpi/stat_sys_secure.pngbin622 -> 0 bytes
-rw-r--r--core/res/res/drawable-xhdpi/stat_sys_secure.pngbin929 -> 0 bytes
-rwxr-xr-xcore/res/res/drawable-xxhdpi/stat_sys_secure.pngbin702 -> 0 bytes
-rw-r--r--core/res/res/values/public.xml1
-rw-r--r--core/res/res/values/strings.xml5
-rw-r--r--core/res/res/values/symbols.xml2
-rw-r--r--media/java/android/media/MediaTimeProvider.java2
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java22
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java7
13 files changed, 8 insertions, 34 deletions
diff --git a/api/current.txt b/api/current.txt
index 7d06e1c..099b1a5 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -845,6 +845,7 @@ package android {
field public static final int prompt = 16843131; // 0x101017b
field public static final int propertyName = 16843489; // 0x10102e1
field public static final int protectionLevel = 16842761; // 0x1010009
+ field public static final int provideAssistData = 16843756; // 0x10103ec
field public static final int publicKey = 16843686; // 0x10103a6
field public static final int queryActionMsg = 16843227; // 0x10101db
field public static final int queryAfterZeroResults = 16843394; // 0x1010282
diff --git a/core/java/android/content/pm/ServiceInfo.java b/core/java/android/content/pm/ServiceInfo.java
index 3f17dc4..3dc8717 100644
--- a/core/java/android/content/pm/ServiceInfo.java
+++ b/core/java/android/content/pm/ServiceInfo.java
@@ -52,7 +52,7 @@ public class ServiceInfo extends ComponentInfo
* Bit in {@link #flags}: If set,
* {@link android.app.Service#onProvideAssistData(android.os.Bundle)} will
* be called on the service when it is running in the foreground. Set from
- * the android.R.attr#provideAssistData attribute.
+ * the {@link android.R.attr#provideAssistData} attribute.
*/
public static final int FLAG_PROVIDE_ASSIST_DATA = 0x0004;
diff --git a/core/res/res/drawable-hdpi/stat_sys_secure.png b/core/res/res/drawable-hdpi/stat_sys_secure.png
deleted file mode 100644
index 5e979db..0000000
--- a/core/res/res/drawable-hdpi/stat_sys_secure.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-ldpi/stat_sys_secure.png b/core/res/res/drawable-ldpi/stat_sys_secure.png
deleted file mode 100644
index 096aa95..0000000
--- a/core/res/res/drawable-ldpi/stat_sys_secure.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-mdpi/stat_sys_secure.png b/core/res/res/drawable-mdpi/stat_sys_secure.png
deleted file mode 100644
index da3e318..0000000
--- a/core/res/res/drawable-mdpi/stat_sys_secure.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/stat_sys_secure.png b/core/res/res/drawable-xhdpi/stat_sys_secure.png
deleted file mode 100644
index bef2fd7..0000000
--- a/core/res/res/drawable-xhdpi/stat_sys_secure.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/stat_sys_secure.png b/core/res/res/drawable-xxhdpi/stat_sys_secure.png
deleted file mode 100755
index 07c27cb..0000000
--- a/core/res/res/drawable-xxhdpi/stat_sys_secure.png
+++ /dev/null
Binary files differ
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index dce2db0..e6702b0 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2075,5 +2075,6 @@
<public type="attr" name="supportsSwitchingToNextInputMethod" />
<public type="attr" name="requireDeviceUnlock" />
<public type="attr" name="apduServiceBanner" />
+ <public type="attr" name="provideAssistData" />
</resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index f5f9bf6..aa04bf6 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3970,11 +3970,6 @@
<!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
<string name="share_action_provider_share_with">Share with</string>
- <!-- Status Bar icon descriptions -->
-
- <!-- Description of for the status bar's icon that the device is locked for accessibility. [CHAR LIMIT=NONE] -->
- <string name="status_bar_device_locked">Device locked.</string>
-
<!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
<string name="list_delimeter">", "</string>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 2b3c287..1035054 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1249,7 +1249,6 @@
<java-symbol type="drawable" name="jog_tab_target_yellow" />
<java-symbol type="drawable" name="magnified_region_frame" />
<java-symbol type="drawable" name="menu_background" />
- <java-symbol type="drawable" name="stat_sys_secure" />
<java-symbol type="id" name="action_mode_bar_stub" />
<java-symbol type="id" name="button0" />
<java-symbol type="id" name="button4" />
@@ -1312,7 +1311,6 @@
<java-symbol type="string" name="global_action_toggle_silent_mode" />
<java-symbol type="string" name="invalidPuk" />
<java-symbol type="string" name="lockscreen_carrier_default" />
- <java-symbol type="string" name="status_bar_device_locked" />
<java-symbol type="style" name="Animation.LockScreen" />
<java-symbol type="style" name="Theme.Dialog.RecentApplications" />
<java-symbol type="style" name="Theme.ExpandedMenu" />
diff --git a/media/java/android/media/MediaTimeProvider.java b/media/java/android/media/MediaTimeProvider.java
index c1fda81..fe37712 100644
--- a/media/java/android/media/MediaTimeProvider.java
+++ b/media/java/android/media/MediaTimeProvider.java
@@ -59,7 +59,7 @@ public interface MediaTimeProvider {
* greater than or equal to the last returned time. Don't
* always set this to true. E.g. this has undesired
* consequences if the media is seeked between calls.
- * @throw IllegalStateException if the media is not initialized
+ * @throws IllegalStateException if the media is not initialized
*/
public long getCurrentTimeUs(boolean precise, boolean monotonic)
throws IllegalStateException;
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
index 597fb3b..e746f72 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
@@ -153,8 +153,6 @@ public class KeyguardViewMediator {
private AlarmManager mAlarmManager;
private AudioManager mAudioManager;
private StatusBarManager mStatusBarManager;
- private boolean mShowLockIcon;
- private boolean mShowingLockIcon;
private boolean mSwitchingUser;
private boolean mSystemReady;
@@ -494,7 +492,6 @@ public class KeyguardViewMediator {
mLockPatternUtils);
final ContentResolver cr = mContext.getContentResolver();
- mShowLockIcon = (Settings.System.getInt(cr, "show_status_bar_lock", 0) == 1);
mScreenOn = mPM.isScreenOn();
@@ -1227,25 +1224,6 @@ public class KeyguardViewMediator {
if (mStatusBarManager == null) {
Log.w(TAG, "Could not get status bar manager");
} else {
- if (mShowLockIcon) {
- // Give feedback to user when secure keyguard is active and engaged
- if (mShowing && isSecure()) {
- if (!mShowingLockIcon) {
- String contentDescription = mContext.getString(
- com.android.internal.R.string.status_bar_device_locked);
- mStatusBarManager.setIcon("secure",
- com.android.internal.R.drawable.stat_sys_secure, 0,
- contentDescription);
- mShowingLockIcon = true;
- }
- } else {
- if (mShowingLockIcon) {
- mStatusBarManager.removeIcon("secure");
- mShowingLockIcon = false;
- }
- }
- }
-
// Disable aspects of the system/status/navigation bars that must not be re-enabled by
// windows that appear on top, ever
int flags = StatusBarManager.DISABLE_NONE;
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 1813593..75cf5d0 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -407,12 +407,13 @@ public final class ActivityManagerService extends ActivityManagerNative
@Override
public void run() {
if (activityExtras == null) {
- Slog.w(TAG, "getAssistContextExtras failed: timeout retrieving from " + activity);
+ Slog.w(TAG, "getAssistContextExtras failed: timeout retrieving from activtity "
+ + activity);
}
for (int i = 0; i < services.size(); i++) {
if (servicesExtras[i] == null) {
- Slog.w(TAG, "getAssistContextExtras failed: timeout retrieving from "
- + services.get(i));
+ Slog.w(TAG, "getAssistContextExtras failed: timeout retrieving from service "
+ + i + " " + services.get(i));
}
}
synchronized (this) {
generated by cgit v1.1 at 2025-03-13 14:27:52 +0000