summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/ActivityManager.java11
-rw-r--r--core/java/android/content/pm/IPackageManager.aidl2
-rw-r--r--core/java/android/content/pm/PackageInstaller.java2
-rw-r--r--core/java/android/os/StrictMode.java3
-rw-r--r--core/java/android/transition/ChangeBounds.java17
-rw-r--r--core/java/com/android/internal/util/XmlUtils.java1
6 files changed, 18 insertions, 18 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index cd6088f..84a7f5d 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -931,7 +931,7 @@ public class ActivityManager {
* purposes of control flow will be incorrect.</p>
*
* @deprecated As of {@link android.os.Build.VERSION_CODES#L}, this method is
- * no longer available to third party applications: as the introduction of
+ * no longer available to third party applications: the introduction of
* document-centric recents means
* it can leak personal information to the caller. For backwards compatibility,
* it will still return a small subset of its data: at least the caller's
@@ -947,9 +947,6 @@ public class ActivityManager {
*
* @return Returns a list of RecentTaskInfo records describing each of
* the recent tasks.
- *
- * @throws SecurityException Throws SecurityException if the caller does
- * not hold the {@link android.Manifest.permission#GET_TASKS} permission.
*/
@Deprecated
public List<RecentTaskInfo> getRecentTasks(int maxNum, int flags)
@@ -976,9 +973,6 @@ public class ActivityManager {
* @return Returns a list of RecentTaskInfo records describing each of
* the recent tasks.
*
- * @throws SecurityException Throws SecurityException if the caller does
- * not hold the {@link android.Manifest.permission#GET_TASKS} or the
- * {@link android.Manifest.permission#INTERACT_ACROSS_USERS_FULL} permissions.
* @hide
*/
public List<RecentTaskInfo> getRecentTasksForUser(int maxNum, int flags, int userId)
@@ -1236,9 +1230,6 @@ public class ActivityManager {
*
* @return Returns a list of RunningTaskInfo records describing each of
* the running tasks.
- *
- * @throws SecurityException Throws SecurityException if the caller does
- * not hold the {@link android.Manifest.permission#GET_TASKS} permission.
*/
@Deprecated
public List<RunningTaskInfo> getRunningTasks(int maxNum)
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index 6d9c58b..c37534a 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -111,6 +111,8 @@ interface IPackageManager {
int getFlagsForUid(int uid);
+ boolean isUidPrivileged(int uid);
+
String[] getAppOpPermissionPackages(String permissionName);
ResolveInfo resolveIntent(in Intent intent, String resolvedType, int flags, int userId);
diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java
index db8fac2..f249c5f 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -880,6 +880,8 @@ public class PackageInstaller {
/** {@hide} */
public String appLabel;
/** {@hide} */
+ public long appIconLastModified = -1;
+ /** {@hide} */
public Uri originatingUri;
/** {@hide} */
public Uri referrerUri;
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index 47ea732..6db5f67 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -1726,6 +1726,7 @@ public final class StrictMode {
if (LOG_V) Log.d(TAG, "strict mode violation stacks read from binder call. i=" + i);
ViolationInfo info = new ViolationInfo(p, !currentlyGathering);
if (info.crashInfo.stackTrace != null && info.crashInfo.stackTrace.length() > 10000) {
+ String front = info.crashInfo.stackTrace.substring(256);
// 10000 characters is way too large for this to be any sane kind of
// strict mode collection of stacks. We've had a problem where we leave
// strict mode violations associated with the thread, and it keeps tacking
@@ -1742,7 +1743,7 @@ public final class StrictMode {
// Now report the problem.
Slog.wtfStack(TAG, "Stack is too large: numViolations=" + numViolations
+ " policy=#" + Integer.toHexString(policyMask)
- + " front=" + info.crashInfo.stackTrace.substring(256));
+ + " front=" + front);
return;
}
info.crashInfo.stackTrace += "# via Binder call with stack:\n" + ourStack;
diff --git a/core/java/android/transition/ChangeBounds.java b/core/java/android/transition/ChangeBounds.java
index eb17429..0a44ba2 100644
--- a/core/java/android/transition/ChangeBounds.java
+++ b/core/java/android/transition/ChangeBounds.java
@@ -117,13 +117,16 @@ public class ChangeBounds extends Transition {
private void captureValues(TransitionValues values) {
View view = values.view;
- values.values.put(PROPNAME_BOUNDS, new Rect(view.getLeft(), view.getTop(),
- view.getRight(), view.getBottom()));
- values.values.put(PROPNAME_PARENT, values.view.getParent());
- if (mReparent) {
- values.view.getLocationInWindow(tempLocation);
- values.values.put(PROPNAME_WINDOW_X, tempLocation[0]);
- values.values.put(PROPNAME_WINDOW_Y, tempLocation[1]);
+
+ if (view.isLaidOut()) {
+ values.values.put(PROPNAME_BOUNDS, new Rect(view.getLeft(), view.getTop(),
+ view.getRight(), view.getBottom()));
+ values.values.put(PROPNAME_PARENT, values.view.getParent());
+ if (mReparent) {
+ values.view.getLocationInWindow(tempLocation);
+ values.values.put(PROPNAME_WINDOW_X, tempLocation[0]);
+ values.values.put(PROPNAME_WINDOW_Y, tempLocation[1]);
+ }
}
}
diff --git a/core/java/com/android/internal/util/XmlUtils.java b/core/java/com/android/internal/util/XmlUtils.java
index 45d790b..e9baaa8 100644
--- a/core/java/com/android/internal/util/XmlUtils.java
+++ b/core/java/com/android/internal/util/XmlUtils.java
@@ -1503,6 +1503,7 @@ public class XmlUtils {
}
}
+ @Deprecated
public static void writeBitmapAttribute(XmlSerializer out, String name, Bitmap value)
throws IOException {
if (value != null) {
generated by cgit v1.1 at 2025-11-29 05:39:14 +0000