Merge "Stop sign-extending RS IDs." into lmp-dev
diff --git a/Android.mk b/Android.mk
index b419231..1cdc709 100644
--- a/Android.mk
+++ b/Android.mk
@@ -329,6 +329,7 @@
media/java/android/media/projection/IMediaProjection.aidl \
media/java/android/media/projection/IMediaProjectionCallback.aidl \
media/java/android/media/projection/IMediaProjectionManager.aidl \
+ media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl \
media/java/android/media/routing/IMediaRouteService.aidl \
media/java/android/media/routing/IMediaRouteClientCallback.aidl \
media/java/android/media/routing/IMediaRouter.aidl \
diff --git a/api/current.txt b/api/current.txt
index b5507ab..b8a65fc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1037,7 +1037,6 @@
field public static final int required = 16843406; // 0x101028e
field public static final int requiredAccountType = 16843734; // 0x10103d6
field public static final int requiredForAllUsers = 16843728; // 0x10103d0
- field public static final int requiredForProfile = 16843816; // 0x1010428
field public static final int requiresFadingEdge = 16843685; // 0x10103a5
field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364
field public static final int resizeMode = 16843619; // 0x1010363
@@ -8596,19 +8595,26 @@
}
public class LauncherApps {
+ method public void addCallback(android.content.pm.LauncherApps.Callback);
+ method public void addCallback(android.content.pm.LauncherApps.Callback, android.os.Handler);
method public void addOnAppsChangedCallback(android.content.pm.LauncherApps.OnAppsChangedCallback);
method public void addOnAppsChangedCallback(android.content.pm.LauncherApps.OnAppsChangedCallback, android.os.Handler);
method public java.util.List<android.content.pm.LauncherActivityInfo> getActivityList(java.lang.String, android.os.UserHandle);
+ method public boolean isActivityEnabled(android.content.ComponentName, android.os.UserHandle);
method public boolean isActivityEnabledForProfile(android.content.ComponentName, android.os.UserHandle);
+ method public boolean isPackageEnabled(java.lang.String, android.os.UserHandle);
method public boolean isPackageEnabledForProfile(java.lang.String, android.os.UserHandle);
+ method public void removeCallback(android.content.pm.LauncherApps.Callback);
method public void removeOnAppsChangedCallback(android.content.pm.LauncherApps.OnAppsChangedCallback);
method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
method public void showAppDetailsForProfile(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
method public void startActivityForProfile(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
+ method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
+ method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
}
- public static abstract class LauncherApps.OnAppsChangedCallback {
- ctor public LauncherApps.OnAppsChangedCallback();
+ public static abstract class LauncherApps.Callback {
+ ctor public LauncherApps.Callback();
method public abstract void onPackageAdded(java.lang.String, android.os.UserHandle);
method public abstract void onPackageChanged(java.lang.String, android.os.UserHandle);
method public abstract void onPackageRemoved(java.lang.String, android.os.UserHandle);
@@ -8616,6 +8622,10 @@
method public abstract void onPackagesUnavailable(java.lang.String[], android.os.UserHandle, boolean);
}
+ public static abstract class LauncherApps.OnAppsChangedCallback extends android.content.pm.LauncherApps.Callback {
+ ctor public LauncherApps.OnAppsChangedCallback();
+ }
+
public class PackageInfo implements android.os.Parcelable {
ctor public PackageInfo();
method public int describeContents();
@@ -8667,14 +8677,14 @@
field public static final java.lang.String EXTRA_STATUS = "android.content.pm.extra.STATUS";
field public static final java.lang.String EXTRA_STATUS_MESSAGE = "android.content.pm.extra.STATUS_MESSAGE";
field public static final int STATUS_FAILURE = 1; // 0x1
- field public static final int STATUS_FAILURE_ABORTED = 2; // 0x2
- field public static final int STATUS_FAILURE_BLOCKED = 1; // 0x1
- field public static final int STATUS_FAILURE_CONFLICT = 4; // 0x4
- field public static final int STATUS_FAILURE_INCOMPATIBLE = 6; // 0x6
- field public static final int STATUS_FAILURE_INVALID = 3; // 0x3
- field public static final int STATUS_FAILURE_STORAGE = 5; // 0x5
+ field public static final int STATUS_FAILURE_ABORTED = 3; // 0x3
+ field public static final int STATUS_FAILURE_BLOCKED = 2; // 0x2
+ field public static final int STATUS_FAILURE_CONFLICT = 5; // 0x5
+ field public static final int STATUS_FAILURE_INCOMPATIBLE = 7; // 0x7
+ field public static final int STATUS_FAILURE_INVALID = 4; // 0x4
+ field public static final int STATUS_FAILURE_STORAGE = 6; // 0x6
+ field public static final int STATUS_PENDING_USER_ACTION = -1; // 0xffffffff
field public static final int STATUS_SUCCESS = 0; // 0x0
- field public static final int STATUS_USER_ACTION_REQUIRED = -1; // 0xffffffff
}
public static class PackageInstaller.Session implements java.io.Closeable {
@@ -8682,7 +8692,7 @@
method public void close();
method public void commit(android.content.IntentSender);
method public void fsync(java.io.OutputStream) throws java.io.IOException;
- method public java.lang.String[] getNames();
+ method public java.lang.String[] getNames() throws java.io.IOException;
method public java.io.InputStream openRead(java.lang.String) throws java.io.IOException;
method public java.io.OutputStream openWrite(java.lang.String, long, long) throws java.io.IOException;
method public void setProgress(float);
@@ -13305,85 +13315,6 @@
}
-package android.hardware.location {
-
- public final class GeofenceHardware {
- method public boolean addGeofence(int, int, android.hardware.location.GeofenceHardwareRequest, android.hardware.location.GeofenceHardwareCallback);
- method public int[] getMonitoringTypes();
- method public int getStatusOfMonitoringType(int);
- method public boolean pauseGeofence(int, int);
- method public boolean registerForMonitorStateChangeCallback(int, android.hardware.location.GeofenceHardwareMonitorCallback);
- method public boolean removeGeofence(int, int);
- method public boolean resumeGeofence(int, int, int);
- method public boolean unregisterForMonitorStateChangeCallback(int, android.hardware.location.GeofenceHardwareMonitorCallback);
- field public static final int GEOFENCE_ENTERED = 1; // 0x1
- field public static final int GEOFENCE_ERROR_ID_EXISTS = 2; // 0x2
- field public static final int GEOFENCE_ERROR_ID_UNKNOWN = 3; // 0x3
- field public static final int GEOFENCE_ERROR_INSUFFICIENT_MEMORY = 6; // 0x6
- field public static final int GEOFENCE_ERROR_INVALID_TRANSITION = 4; // 0x4
- field public static final int GEOFENCE_ERROR_TOO_MANY_GEOFENCES = 1; // 0x1
- field public static final int GEOFENCE_EXITED = 2; // 0x2
- field public static final int GEOFENCE_FAILURE = 5; // 0x5
- field public static final int GEOFENCE_SUCCESS = 0; // 0x0
- field public static final int GEOFENCE_UNCERTAIN = 4; // 0x4
- field public static final int MONITORING_TYPE_FUSED_HARDWARE = 1; // 0x1
- field public static final int MONITORING_TYPE_GPS_HARDWARE = 0; // 0x0
- field public static final int MONITOR_CURRENTLY_AVAILABLE = 0; // 0x0
- field public static final int MONITOR_CURRENTLY_UNAVAILABLE = 1; // 0x1
- field public static final int MONITOR_UNSUPPORTED = 2; // 0x2
- field public static final int SOURCE_TECHNOLOGY_BLUETOOTH = 16; // 0x10
- field public static final int SOURCE_TECHNOLOGY_CELL = 8; // 0x8
- field public static final int SOURCE_TECHNOLOGY_GNSS = 1; // 0x1
- field public static final int SOURCE_TECHNOLOGY_SENSORS = 4; // 0x4
- field public static final int SOURCE_TECHNOLOGY_WIFI = 2; // 0x2
- }
-
- public abstract class GeofenceHardwareCallback {
- ctor public GeofenceHardwareCallback();
- method public void onGeofenceAdd(int, int);
- method public void onGeofencePause(int, int);
- method public void onGeofenceRemove(int, int);
- method public void onGeofenceResume(int, int);
- method public void onGeofenceTransition(int, int, android.location.Location, long, int);
- }
-
- public abstract class GeofenceHardwareMonitorCallback {
- ctor public GeofenceHardwareMonitorCallback();
- method public deprecated void onMonitoringSystemChange(int, boolean, android.location.Location);
- method public void onMonitoringSystemChange(android.hardware.location.GeofenceHardwareMonitorEvent);
- }
-
- public class GeofenceHardwareMonitorEvent implements android.os.Parcelable {
- ctor public GeofenceHardwareMonitorEvent(int, int, int, android.location.Location);
- method public int describeContents();
- method public android.location.Location getLocation();
- method public int getMonitoringStatus();
- method public int getMonitoringType();
- method public int getSourceTechnologies();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator CREATOR;
- }
-
- public final class GeofenceHardwareRequest {
- ctor public GeofenceHardwareRequest();
- method public static android.hardware.location.GeofenceHardwareRequest createCircularGeofence(double, double, double);
- method public int getLastTransition();
- method public double getLatitude();
- method public double getLongitude();
- method public int getMonitorTransitions();
- method public int getNotificationResponsiveness();
- method public double getRadius();
- method public int getSourceTechnologies();
- method public int getUnknownTimer();
- method public void setLastTransition(int);
- method public void setMonitorTransitions(int);
- method public void setNotificationResponsiveness(int);
- method public void setSourceTechnologies(int);
- method public void setUnknownTimer(int);
- }
-
-}
-
package android.hardware.usb {
public class UsbAccessory implements android.os.Parcelable {
@@ -16692,33 +16623,41 @@
method public void adjustVolume(int, int);
method public android.media.routing.MediaRouter.Delegate createMediaRouterDelegate();
method public boolean dispatchMediaButtonEvent(android.view.KeyEvent);
+ method public android.media.session.MediaController.AudioInfo getAudioInfo();
method public android.os.Bundle getExtras();
method public long getFlags();
method public android.app.PendingIntent getLaunchActivity();
method public android.media.MediaMetadata getMetadata();
method public java.lang.String getPackageName();
method public android.media.session.PlaybackState getPlaybackState();
- method public java.util.List<android.media.session.MediaSession.Track> getQueue();
+ method public java.util.List<android.media.session.MediaSession.Item> getQueue();
method public java.lang.CharSequence getQueueTitle();
method public int getRatingType();
method public android.media.session.MediaSession.Token getSessionToken();
method public android.media.session.MediaController.TransportControls getTransportControls();
- method public android.media.session.MediaController.VolumeInfo getVolumeInfo();
method public void removeCallback(android.media.session.MediaController.Callback);
method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);
method public void setVolumeTo(int, int);
}
+ public static final class MediaController.AudioInfo {
+ method public android.media.AudioAttributes getAudioAttributes();
+ method public int getCurrentVolume();
+ method public int getMaxVolume();
+ method public int getVolumeControl();
+ method public int getVolumeType();
+ }
+
public static abstract class MediaController.Callback {
ctor public MediaController.Callback();
+ method public void onAudioInfoChanged(android.media.session.MediaController.AudioInfo);
method public void onExtrasChanged(android.os.Bundle);
method public void onMetadataChanged(android.media.MediaMetadata);
method public void onPlaybackStateChanged(android.media.session.PlaybackState);
- method public void onQueueChanged(java.util.List<android.media.session.MediaSession.Track>);
+ method public void onQueueChanged(java.util.List<android.media.session.MediaSession.Item>);
method public void onQueueTitleChanged(java.lang.CharSequence);
method public void onSessionDestroyed();
method public void onSessionEvent(java.lang.String, android.os.Bundle);
- method public void onVolumeInfoChanged(android.media.session.MediaController.VolumeInfo);
}
public final class MediaController.TransportControls {
@@ -16732,20 +16671,12 @@
method public void sendCustomAction(android.media.session.PlaybackState.CustomAction, android.os.Bundle);
method public void sendCustomAction(java.lang.String, android.os.Bundle);
method public void setRating(android.media.Rating);
+ method public void skipToItem(long);
method public void skipToNext();
method public void skipToPrevious();
- method public void skipToTrack(long);
method public void stop();
}
- public static final class MediaController.VolumeInfo {
- method public android.media.AudioAttributes getAudioAttributes();
- method public int getCurrentVolume();
- method public int getMaxVolume();
- method public int getVolumeControl();
- method public int getVolumeType();
- }
-
public final class MediaSession {
ctor public MediaSession(android.content.Context, java.lang.String);
method public android.media.session.MediaController getController();
@@ -16765,7 +16696,7 @@
method public void setPlaybackState(android.media.session.PlaybackState);
method public void setPlaybackToLocal(android.media.AudioAttributes);
method public void setPlaybackToRemote(android.media.VolumeProvider);
- method public void setQueue(java.util.List<android.media.session.MediaSession.Track>);
+ method public void setQueue(java.util.List<android.media.session.MediaSession.Item>);
method public void setQueueTitle(java.lang.CharSequence);
field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1
field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2
@@ -16786,19 +16717,13 @@
method public void onRewind();
method public void onSeekTo(long);
method public void onSetRating(android.media.Rating);
+ method public void onSkipToItem(long);
method public void onSkipToNext();
method public void onSkipToPrevious();
- method public void onSkipToTrack(long);
method public void onStop();
}
- public static final class MediaSession.Token implements android.os.Parcelable {
- method public int describeContents();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator CREATOR;
- }
-
- public static final class MediaSession.Track implements android.os.Parcelable {
+ public static final class MediaSession.Item implements android.os.Parcelable {
method public int describeContents();
method public android.os.Bundle getExtras();
method public long getId();
@@ -16809,20 +16734,25 @@
field public static final int UNKNOWN_ID = -1; // 0xffffffff
}
- public static final class MediaSession.Track.Builder {
- ctor public MediaSession.Track.Builder(android.media.MediaMetadata, long, android.net.Uri);
- method public android.media.session.MediaSession.Track build();
- method public android.media.session.MediaSession.Track.Builder setExtras(android.os.Bundle);
+ public static final class MediaSession.Item.Builder {
+ ctor public MediaSession.Item.Builder(android.media.MediaMetadata, long, android.net.Uri);
+ method public android.media.session.MediaSession.Item build();
+ method public android.media.session.MediaSession.Item.Builder setExtras(android.os.Bundle);
+ }
+
+ public static final class MediaSession.Token implements android.os.Parcelable {
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator CREATOR;
}
public final class MediaSessionManager {
- method public void addActiveSessionsListener(android.media.session.MediaSessionManager.SessionListener, android.content.ComponentName);
+ method public void addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, android.content.ComponentName);
method public java.util.List<android.media.session.MediaController> getActiveSessions(android.content.ComponentName);
- method public void removeActiveSessionsListener(android.media.session.MediaSessionManager.SessionListener);
+ method public void removeOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener);
}
- public static abstract class MediaSessionManager.SessionListener {
- ctor public MediaSessionManager.SessionListener(android.content.Context);
+ public static abstract interface MediaSessionManager.OnActiveSessionsChangedListener {
method public abstract void onActiveSessionsChanged(java.util.List<android.media.session.MediaController>);
}
@@ -16846,9 +16776,9 @@
field public static final long ACTION_REWIND = 8L; // 0x8L
field public static final long ACTION_SEEK_TO = 256L; // 0x100L
field public static final long ACTION_SET_RATING = 128L; // 0x80L
+ field public static final long ACTION_SKIP_TO_ITEM = 4096L; // 0x1000L
field public static final long ACTION_SKIP_TO_NEXT = 32L; // 0x20L
field public static final long ACTION_SKIP_TO_PREVIOUS = 16L; // 0x10L
- field public static final long ACTION_SKIP_TO_TRACK = 4096L; // 0x1000L
field public static final long ACTION_STOP = 1L; // 0x1L
field public static final android.os.Parcelable.Creator CREATOR;
field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL
@@ -16872,7 +16802,7 @@
method public android.media.session.PlaybackState.Builder addCustomAction(android.media.session.PlaybackState.CustomAction);
method public android.media.session.PlaybackState build();
method public android.media.session.PlaybackState.Builder setActions(long);
- method public android.media.session.PlaybackState.Builder setActiveTrack(long);
+ method public android.media.session.PlaybackState.Builder setActiveItem(long);
method public android.media.session.PlaybackState.Builder setBufferPosition(long);
method public android.media.session.PlaybackState.Builder setErrorMessage(java.lang.CharSequence);
method public android.media.session.PlaybackState.Builder setState(int, long, float, long);
@@ -28813,6 +28743,8 @@
package android.telecomm {
public final class AudioState implements android.os.Parcelable {
+ ctor public AudioState(boolean, int, int);
+ ctor public AudioState(android.telecomm.AudioState);
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
@@ -29708,6 +29640,7 @@
method public int hasCarrierPrivileges();
method public boolean hasIccCard();
method public boolean iccCloseLogicalChannel(int);
+ method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
@@ -32309,6 +32242,8 @@
method public void captureEndValues(android.transition.TransitionValues);
method public void captureStartValues(android.transition.TransitionValues);
method public int getOrdering();
+ method public android.transition.Transition getTransitionAt(int);
+ method public int getTransitionCount();
method public android.transition.TransitionSet removeTransition(android.transition.Transition);
method public android.transition.TransitionSet setOrdering(int);
field public static final int ORDERING_SEQUENTIAL = 1; // 0x1
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 21c8b75..f5ac5f7 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2095,7 +2095,9 @@
"by the window decor. Do not request Window.FEATURE_ACTION_BAR and set " +
"android:windowActionBar to false in your theme to use a Toolbar instead.");
}
- mActionBar = new ToolbarActionBar(toolbar, getTitle(), this);
+ ToolbarActionBar tbab = new ToolbarActionBar(toolbar, getTitle(), this);
+ mActionBar = tbab;
+ mWindow.setCallback(tbab.getWrappedWindowCallback());
mActionBar.invalidateOptionsMenu();
}
@@ -3820,6 +3822,29 @@
}
/**
+ * Start a new activity as if it was started by the activity that started our
+ * current activity. This is for the resolver and chooser activities, which operate
+ * as intermediaries that dispatch their intent to the target the user selects -- to
+ * do this, they must perform all security checks including permission grants as if
+ * their launch had come from the original activity.
+ * @hide
+ */
+ public void startActivityAsCaller(Intent intent, @Nullable Bundle options) {
+ if (mParent != null) {
+ throw new RuntimeException("Can't be called from a child");
+ }
+ Instrumentation.ActivityResult ar =
+ mInstrumentation.execStartActivityAsCaller(
+ this, mMainThread.getApplicationThread(), mToken, this,
+ intent, -1, options);
+ if (ar != null) {
+ mMainThread.sendActivityResult(
+ mToken, mEmbeddedID, -1, ar.getResultCode(),
+ ar.getResultData());
+ }
+ }
+
+ /**
* Same as calling {@link #startIntentSenderForResult(IntentSender, int,
* Intent, int, int, int, Bundle)} with no options.
*
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index 31cb4d6..1cb1047 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -169,6 +169,31 @@
return true;
}
+ case START_ACTIVITY_AS_CALLER_TRANSACTION:
+ {
+ data.enforceInterface(IActivityManager.descriptor);
+ IBinder b = data.readStrongBinder();
+ IApplicationThread app = ApplicationThreadNative.asInterface(b);
+ String callingPackage = data.readString();
+ Intent intent = Intent.CREATOR.createFromParcel(data);
+ String resolvedType = data.readString();
+ IBinder resultTo = data.readStrongBinder();
+ String resultWho = data.readString();
+ int requestCode = data.readInt();
+ int startFlags = data.readInt();
+ String profileFile = data.readString();
+ ParcelFileDescriptor profileFd = data.readInt() != 0
+ ? data.readFileDescriptor() : null;
+ Bundle options = data.readInt() != 0
+ ? Bundle.CREATOR.createFromParcel(data) : null;
+ int result = startActivityAsCaller(app, callingPackage, intent, resolvedType,
+ resultTo, resultWho, requestCode, startFlags,
+ profileFile, profileFd, options);
+ reply.writeNoException();
+ reply.writeInt(result);
+ return true;
+ }
+
case START_ACTIVITY_AND_WAIT_TRANSACTION:
{
data.enforceInterface(IActivityManager.descriptor);
@@ -2347,6 +2372,41 @@
data.recycle();
return result;
}
+ public int startActivityAsCaller(IApplicationThread caller, String callingPackage,
+ Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
+ int startFlags, String profileFile,
+ ParcelFileDescriptor profileFd, Bundle options) throws RemoteException {
+ Parcel data = Parcel.obtain();
+ Parcel reply = Parcel.obtain();
+ data.writeInterfaceToken(IActivityManager.descriptor);
+ data.writeStrongBinder(caller != null ? caller.asBinder() : null);
+ data.writeString(callingPackage);
+ intent.writeToParcel(data, 0);
+ data.writeString(resolvedType);
+ data.writeStrongBinder(resultTo);
+ data.writeString(resultWho);
+ data.writeInt(requestCode);
+ data.writeInt(startFlags);
+ data.writeString(profileFile);
+ if (profileFd != null) {
+ data.writeInt(1);
+ profileFd.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
+ } else {
+ data.writeInt(0);
+ }
+ if (options != null) {
+ data.writeInt(1);
+ options.writeToParcel(data, 0);
+ } else {
+ data.writeInt(0);
+ }
+ mRemote.transact(START_ACTIVITY_AS_CALLER_TRANSACTION, data, reply, 0);
+ reply.readException();
+ int result = reply.readInt();
+ reply.recycle();
+ data.recycle();
+ return result;
+ }
public WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,
Intent intent, String resolvedType, IBinder resultTo, String resultWho,
int requestCode, int startFlags, String profileFile,
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index d9ea671..2136209 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -3494,6 +3494,20 @@
synchronized (mResourcesManager) {
mCoreSettings = coreSettings;
}
+ onCoreSettingsChange();
+ }
+
+ private void onCoreSettingsChange() {
+ boolean debugViewAttributes =
+ mCoreSettings.getInt(Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0;
+ if (debugViewAttributes != View.mDebugViewAttributes) {
+ View.mDebugViewAttributes = debugViewAttributes;
+
+ // request all activities to relaunch for the changes to take place
+ for (Map.Entry<IBinder, ActivityClientRecord> entry : mActivities.entrySet()) {
+ requestRelaunchActivity(entry.getKey(), null, null, 0, false, null, false);
+ }
+ }
}
private void handleUpdatePackageCompatibilityInfo(UpdateCompatibilityData data) {
@@ -4324,6 +4338,9 @@
final boolean is24Hr = "24".equals(mCoreSettings.getString(Settings.System.TIME_12_24));
DateFormat.set24HourTimePref(is24Hr);
+ View.mDebugViewAttributes =
+ mCoreSettings.getInt(Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0;
+
/**
* For system applications on userdebug/eng builds, log stack
* traces of disk and network access to dropbox for analysis.
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index 2dbc4ea..8e21899 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -68,6 +68,10 @@
Intent intent, String resolvedType, IBinder resultTo, String resultWho,
int requestCode, int flags, String profileFile,
ParcelFileDescriptor profileFd, Bundle options, int userId) throws RemoteException;
+ public int startActivityAsCaller(IApplicationThread caller, String callingPackage,
+ Intent intent, String resolvedType, IBinder resultTo, String resultWho,
+ int requestCode, int flags, String profileFile,
+ ParcelFileDescriptor profileFd, Bundle options) throws RemoteException;
public WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,
Intent intent, String resolvedType, IBinder resultTo, String resultWho,
int requestCode, int flags, String profileFile,
@@ -760,4 +764,5 @@
int START_ACTIVITY_FROM_RECENTS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 229;
int NOTIFY_ENTER_ANIMATION_COMPLETE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+230;
int KEYGUARD_WAITING_FOR_ACTIVITY_DRAWN_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+231;
+ int START_ACTIVITY_AS_CALLER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+232;
}
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index c583998..b28d7cc 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -1665,6 +1665,43 @@
return null;
}
+ /**
+ * Special version!
+ * @hide
+ */
+ public ActivityResult execStartActivityAsCaller(
+ Context who, IBinder contextThread, IBinder token, Activity target,
+ Intent intent, int requestCode, Bundle options) {
+ IApplicationThread whoThread = (IApplicationThread) contextThread;
+ if (mActivityMonitors != null) {
+ synchronized (mSync) {
+ final int N = mActivityMonitors.size();
+ for (int i=0; i<N; i++) {
+ final ActivityMonitor am = mActivityMonitors.get(i);
+ if (am.match(who, null, intent)) {
+ am.mHits++;
+ if (am.isBlocking()) {
+ return requestCode >= 0 ? am.getResult() : null;
+ }
+ break;
+ }
+ }
+ }
+ }
+ try {
+ intent.migrateExtraStreamToClipData();
+ intent.prepareToLeaveProcess();
+ int result = ActivityManagerNative.getDefault()
+ .startActivityAsCaller(whoThread, who.getBasePackageName(), intent,
+ intent.resolveTypeIfNeeded(who.getContentResolver()),
+ token, target != null ? target.mEmbeddedID : null,
+ requestCode, 0, null, null, options);
+ checkStartActivityResult(result, intent);
+ } catch (RemoteException e) {
+ }
+ return null;
+ }
+
/*package*/ final void init(ActivityThread thread,
Context instrContext, Context appContext, ComponentName component,
IInstrumentationWatcher watcher, IUiAutomationConnection uiAutomationConnection) {
diff --git a/core/java/android/app/TimePickerDialog.java b/core/java/android/app/TimePickerDialog.java
index 697c5d8..6454367 100644
--- a/core/java/android/app/TimePickerDialog.java
+++ b/core/java/android/app/TimePickerDialog.java
@@ -110,6 +110,7 @@
setView(view);
setButton(BUTTON_POSITIVE, themeContext.getString(R.string.ok), this);
setButton(BUTTON_NEGATIVE, themeContext.getString(R.string.cancel), this);
+ setButtonPanelLayoutHint(LAYOUT_HINT_SIDE);
mTimePicker = (TimePicker) view.findViewById(R.id.timePicker);
mTimePicker.setIs24HourView(mIs24HourView);
diff --git a/core/java/android/app/backup/BackupDataInput.java b/core/java/android/app/backup/BackupDataInput.java
index 03205fb..26f9e3e 100644
--- a/core/java/android/app/backup/BackupDataInput.java
+++ b/core/java/android/app/backup/BackupDataInput.java
@@ -16,6 +16,8 @@
package android.app.backup;
+import android.annotation.SystemApi;
+
import java.io.FileDescriptor;
import java.io.IOException;
@@ -70,6 +72,7 @@
}
/** @hide */
+ @SystemApi
public BackupDataInput(FileDescriptor fd) {
if (fd == null) throw new NullPointerException();
mBackupReader = ctor(fd);
@@ -79,6 +82,7 @@
}
/** @hide */
+ @Override
protected void finalize() throws Throwable {
try {
dtor(mBackupReader);
@@ -174,7 +178,7 @@
* for further processing. This allows a {@link android.app.backup.BackupAgent} to
* efficiently discard obsolete or otherwise uninteresting records during the
* restore operation.
- *
+ *
* @throws IOException if an error occurred when trying to read the restore data stream
*/
public void skipEntityData() throws IOException {
diff --git a/core/java/android/app/backup/BackupDataOutput.java b/core/java/android/app/backup/BackupDataOutput.java
index fc5fb3d..048a4bb 100644
--- a/core/java/android/app/backup/BackupDataOutput.java
+++ b/core/java/android/app/backup/BackupDataOutput.java
@@ -16,6 +16,7 @@
package android.app.backup;
+import android.annotation.SystemApi;
import android.os.ParcelFileDescriptor;
import android.os.Process;
@@ -66,6 +67,7 @@
long mBackupWriter;
/** @hide */
+ @SystemApi
public BackupDataOutput(FileDescriptor fd) {
if (fd == null) throw new NullPointerException();
mBackupWriter = ctor(fd);
@@ -115,6 +117,7 @@
}
/** @hide */
+ @Override
protected void finalize() throws Throwable {
try {
dtor(mBackupWriter);
diff --git a/core/java/android/app/backup/BackupTransport.java b/core/java/android/app/backup/BackupTransport.java
index 6cfabf0..70bb5e4 100644
--- a/core/java/android/app/backup/BackupTransport.java
+++ b/core/java/android/app/backup/BackupTransport.java
@@ -51,7 +51,7 @@
public static final int AGENT_UNKNOWN = -1004;
IBackupTransport mBinderImpl = new TransportImpl();
- /** @hide */
+
public IBinder getBinder() {
return mBinderImpl.asBinder();
}
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 0ca800f..b13792b 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -1612,7 +1612,7 @@
* @see #requestSync(android.accounts.Account, String, android.os.Bundle)
*/
public void notifyChange(Uri uri, ContentObserver observer, boolean syncToNetwork) {
- notifyChange(uri, observer, syncToNetwork, UserHandle.getCallingUserId());
+ notifyChange(uri, observer, syncToNetwork, UserHandle.myUserId());
}
/**
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 5f046c5..a13a928 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -45,6 +45,7 @@
import android.util.AttributeSet;
import android.view.DisplayAdjustments;
import android.view.Display;
+import android.view.ViewDebug;
import android.view.WindowManager;
import java.io.File;
@@ -420,6 +421,7 @@
/**
* Return the Theme object associated with this Context.
*/
+ @ViewDebug.ExportedProperty(deepExport = true)
public abstract Resources.Theme getTheme();
/**
diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java
index 268919c..f9370b3 100644
--- a/core/java/android/content/pm/LauncherApps.java
+++ b/core/java/android/content/pm/LauncherApps.java
@@ -64,7 +64,7 @@
/**
* Callbacks for package changes to this and related managed profiles.
*/
- public static abstract class OnAppsChangedCallback {
+ public static abstract class Callback {
/**
* Indicates that a package was removed from the specified profile.
*
@@ -207,17 +207,17 @@
}
/**
- * Starts an activity in the specified profile.
+ * Starts a Main activity in the specified profile.
*
* @param component The ComponentName of the activity to launch
* @param user The UserHandle of the profile
* @param sourceBounds The Rect containing the source bounds of the clicked icon
* @param opts Options to pass to startActivity
*/
- public void startActivityForProfile(ComponentName component, UserHandle user, Rect sourceBounds,
+ public void startMainActivity(ComponentName component, UserHandle user, Rect sourceBounds,
Bundle opts) {
if (DEBUG) {
- Log.i(TAG, "StartActivityForProfile " + component + " " + user.getIdentifier());
+ Log.i(TAG, "StartMainActivity " + component + " " + user.getIdentifier());
}
try {
mService.startActivityAsUser(component, sourceBounds, opts, user);
@@ -235,7 +235,7 @@
* @param sourceBounds The Rect containing the source bounds of the clicked icon
* @param opts Options to pass to startActivity
*/
- public void showAppDetailsForProfile(ComponentName component, UserHandle user,
+ public void startAppDetailsActivity(ComponentName component, UserHandle user,
Rect sourceBounds, Bundle opts) {
try {
mService.showAppDetailsAsUser(component, sourceBounds, opts, user);
@@ -252,7 +252,7 @@
*
* @return true if the package exists and is enabled.
*/
- public boolean isPackageEnabledForProfile(String packageName, UserHandle user) {
+ public boolean isPackageEnabled(String packageName, UserHandle user) {
try {
return mService.isPackageEnabled(packageName, user);
} catch (RemoteException re) {
@@ -268,7 +268,7 @@
*
* @return true if the activity exists and is enabled.
*/
- public boolean isActivityEnabledForProfile(ComponentName component, UserHandle user) {
+ public boolean isActivityEnabled(ComponentName component, UserHandle user) {
try {
return mService.isActivityEnabled(component, user);
} catch (RemoteException re) {
@@ -282,8 +282,8 @@
*
* @param callback The callback to add.
*/
- public void addOnAppsChangedCallback(OnAppsChangedCallback callback) {
- addOnAppsChangedCallback(callback, null);
+ public void addCallback(Callback callback) {
+ addCallback(callback, null);
}
/**
@@ -292,7 +292,7 @@
* @param callback The callback to add.
* @param handler that should be used to post callbacks on, may be null.
*/
- public void addOnAppsChangedCallback(OnAppsChangedCallback callback, Handler handler) {
+ public void addCallback(Callback callback, Handler handler) {
synchronized (this) {
if (callback != null && !mCallbacks.contains(callback)) {
boolean addedFirstCallback = mCallbacks.size() == 0;
@@ -311,9 +311,9 @@
* Removes a callback that was previously added.
*
* @param callback The callback to remove.
- * @see #addOnAppsChangedListener(OnAppsChangedCallback)
+ * @see #addCallback(Callback)
*/
- public void removeOnAppsChangedCallback(OnAppsChangedCallback callback) {
+ public void removeCallback(Callback callback) {
synchronized (this) {
removeCallbackLocked(callback);
if (mCallbacks.size() == 0) {
@@ -325,7 +325,7 @@
}
}
- private void removeCallbackLocked(OnAppsChangedCallback callback) {
+ private void removeCallbackLocked(Callback callback) {
if (callback == null) {
throw new IllegalArgumentException("Callback cannot be null");
}
@@ -338,7 +338,7 @@
}
}
- private void addCallbackLocked(OnAppsChangedCallback callback, Handler handler) {
+ private void addCallbackLocked(Callback callback, Handler handler) {
// Remove if already present.
removeCallbackLocked(callback);
if (handler == null) {
@@ -421,7 +421,7 @@
private static final int MSG_AVAILABLE = 4;
private static final int MSG_UNAVAILABLE = 5;
- private OnAppsChangedCallback mCallback;
+ private LauncherApps.Callback mCallback;
private static class CallbackInfo {
String[] packageNames;
@@ -430,7 +430,7 @@
UserHandle user;
}
- public CallbackMessageHandler(Looper looper, OnAppsChangedCallback callback) {
+ public CallbackMessageHandler(Looper looper, LauncherApps.Callback callback) {
super(looper, null, true);
mCallback = callback;
}
@@ -499,4 +499,45 @@
obtainMessage(MSG_UNAVAILABLE, info).sendToTarget();
}
}
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public static abstract class OnAppsChangedCallback extends Callback {
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void addOnAppsChangedCallback(OnAppsChangedCallback callback) {
+ addCallback(callback, null);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void addOnAppsChangedCallback(OnAppsChangedCallback callback, Handler handler) {
+ addCallback(callback, handler);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void removeOnAppsChangedCallback(OnAppsChangedCallback callback) {
+ removeCallback(callback);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void startActivityForProfile(ComponentName component, UserHandle user, Rect sourceBounds,
+ Bundle opts) {
+ startMainActivity(component, user, sourceBounds, opts);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public void showAppDetailsForProfile(ComponentName component, UserHandle user,
+ Rect sourceBounds, Bundle opts) {
+ startAppDetailsActivity(component, user, sourceBounds, opts);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public boolean isPackageEnabledForProfile(String packageName, UserHandle user) {
+ return isPackageEnabled(packageName, user);
+ }
+
+ /** Remove after unbundled apps have migrated STOP SHIP */
+ public boolean isActivityEnabledForProfile(ComponentName component, UserHandle user) {
+ return isActivityEnabled(component, user);
+ }
}
diff --git a/core/java/android/content/pm/PackageInfo.java b/core/java/android/content/pm/PackageInfo.java
index a0e3c4a..765b2a9 100644
--- a/core/java/android/content/pm/PackageInfo.java
+++ b/core/java/android/content/pm/PackageInfo.java
@@ -227,19 +227,6 @@
public static final int INSTALL_LOCATION_PREFER_EXTERNAL = 2;
/**
- * Flag for {@link #requiredForProfile}
- * The application will always be installed for a restricted profile.
- * @hide
- */
- public static final int RESTRICTED_PROFILE = 1;
- /**
- * Flag for {@link #requiredForProfile}
- * The application will always be installed for a managed profile.
- * @hide
- */
- public static final int MANAGED_PROFILE = 2;
-
- /**
* The install location requested by the package. From the
* {@link android.R.attr#installLocation} attribute, one of
* {@link #INSTALL_LOCATION_AUTO}, {@link #INSTALL_LOCATION_INTERNAL_ONLY},
@@ -247,12 +234,6 @@
*/
public int installLocation = INSTALL_LOCATION_INTERNAL_ONLY;
- /**
- * Defines which profiles this app is required for.
- * @hide
- */
- public int requiredForProfile;
-
/** @hide */
public boolean requiredForAllUsers;
@@ -313,7 +294,6 @@
dest.writeTypedArray(featureGroups, parcelableFlags);
dest.writeInt(installLocation);
dest.writeInt(requiredForAllUsers ? 1 : 0);
- dest.writeInt(requiredForProfile);
dest.writeString(restrictedAccountType);
dest.writeString(requiredAccountType);
dest.writeString(overlayTarget);
@@ -358,7 +338,6 @@
featureGroups = source.createTypedArray(FeatureGroupInfo.CREATOR);
installLocation = source.readInt();
requiredForAllUsers = source.readInt() != 0;
- requiredForProfile = source.readInt();
restrictedAccountType = source.readString();
requiredAccountType = source.readString();
overlayTarget = source.readString();
diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java
index aa4ea45..4ac701f 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -129,7 +129,7 @@
*
* @see Intent#getParcelableExtra(String)
*/
- public static final int STATUS_USER_ACTION_REQUIRED = -1;
+ public static final int STATUS_PENDING_USER_ACTION = -1;
/**
* The operation succeeded.
@@ -152,7 +152,7 @@
*
* @see #EXTRA_STATUS_MESSAGE
*/
- public static final int STATUS_FAILURE_BLOCKED = 1;
+ public static final int STATUS_FAILURE_BLOCKED = 2;
/**
* The operation failed because it was actively aborted. For example, the
@@ -161,7 +161,7 @@
*
* @see #EXTRA_STATUS_MESSAGE
*/
- public static final int STATUS_FAILURE_ABORTED = 2;
+ public static final int STATUS_FAILURE_ABORTED = 3;
/**
* The operation failed because one or more of the APKs was invalid. For
@@ -170,7 +170,7 @@
*
* @see #EXTRA_STATUS_MESSAGE
*/
- public static final int STATUS_FAILURE_INVALID = 3;
+ public static final int STATUS_FAILURE_INVALID = 4;
/**
* The operation failed because it conflicts (or is inconsistent with) with
@@ -183,7 +183,7 @@
*
* @see #EXTRA_STATUS_MESSAGE
*/
- public static final int STATUS_FAILURE_CONFLICT = 4;
+ public static final int STATUS_FAILURE_CONFLICT = 5;
/**
* The operation failed because of storage issues. For example, the device
@@ -192,7 +192,7 @@
*
* @see #EXTRA_STATUS_MESSAGE
*/
- public static final int STATUS_FAILURE_STORAGE = 5;
+ public static final int STATUS_FAILURE_STORAGE = 6;
/**
* The operation failed because it is fundamentally incompatible with this
@@ -202,7 +202,7 @@
*
* @see #EXTRA_STATUS_MESSAGE
*/
- public static final int STATUS_FAILURE_INCOMPATIBLE = 6;
+ public static final int STATUS_FAILURE_INCOMPATIBLE = 7;
private final Context mContext;
private final PackageManager mPm;
@@ -584,9 +584,12 @@
* This returns all names which have been previously written through
* {@link #openWrite(String, long, long)} as part of this session.
*/
- public @NonNull String[] getNames() {
+ public @NonNull String[] getNames() throws IOException {
try {
return mSession.getNames();
+ } catch (RuntimeException e) {
+ ExceptionUtils.maybeUnwrapIOException(e);
+ throw e;
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index cddefb5..2c50f25 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -413,7 +413,6 @@
if ((pi.applicationInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0
|| (pi.applicationInfo.flags&ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
pi.requiredForAllUsers = p.mRequiredForAllUsers;
- pi.requiredForProfile = p.mRequiredForProfile;
}
pi.restrictedAccountType = p.mRestrictedAccountType;
pi.requiredAccountType = p.mRequiredAccountType;
@@ -2477,8 +2476,6 @@
false)) {
owner.mRequiredForAllUsers = true;
}
- owner.mRequiredForProfile = sa.getInt(
- com.android.internal.R.styleable.AndroidManifestApplication_requiredForProfile, 0);
String restrictedAccountType = sa.getString(com.android.internal.R.styleable
.AndroidManifestApplication_restrictedAccountType);
@@ -4269,9 +4266,6 @@
/* An app that's required for all users and cannot be uninstalled for a user */
public boolean mRequiredForAllUsers;
- /* For which types of profile this app is required */
- public int mRequiredForProfile;
-
/* The restricted account authenticator type that is used by this application */
public String mRestrictedAccountType;
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index fff21aa..31813c10 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -16,6 +16,7 @@
package android.content.res;
+import android.view.ViewDebug;
import com.android.internal.util.XmlUtils;
import org.xmlpull.v1.XmlPullParser;
@@ -1638,12 +1639,41 @@
/*package*/ String getKey() {
return mKey;
}
+
+ private String getResourceNameFromHexString(String hexString) {
+ return getResourceName(Integer.parseInt(hexString, 16));
+ }
+
+ /**
+ * Parses {@link #mKey} and returns a String array that holds pairs of adjacent Theme data:
+ * resource name followed by whether or not it was forced, as specified by
+ * {@link #applyStyle(int, boolean)}.
+ *
+ * @hide
+ */
+ @ViewDebug.ExportedProperty(category = "theme", hasAdjacentMapping = true)
+ public String[] getTheme() {
+ String[] themeData = mKey.split(" ");
+ String[] themes = new String[themeData.length * 2];
+ String theme;
+ boolean forced;
+
+ for (int i = 0, j = themeData.length - 1; i < themes.length; i += 2, --j) {
+ theme = themeData[j];
+ forced = theme.endsWith("!");
+ themes[i] = forced ?
+ getResourceNameFromHexString(theme.substring(0, theme.length() - 1)) :
+ getResourceNameFromHexString(theme);
+ themes[i + 1] = forced ? "forced" : "not forced";
+ }
+ return themes;
+ }
}
/**
* Generate a new Theme object for this set of Resources. It initially
* starts out empty.
- *
+ *
* @return Theme The newly created Theme container.
*/
public final Theme newTheme() {
@@ -1653,7 +1683,7 @@
/**
* Retrieve a set of basic attribute values from an AttributeSet, not
* performing styling of them using a theme and/or style resources.
- *
+ *
* @param set The current attribute values to retrieve.
* @param attrs The specific attributes to be retrieved.
* @return Returns a TypedArray holding an array of the attribute values.
diff --git a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
index fbe26e5..ee0ca9c 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
@@ -1207,6 +1207,9 @@
m.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, bestRange);
}
+ // control.sceneMode -- DISABLED is always available
+ m.set(CaptureRequest.CONTROL_SCENE_MODE, CONTROL_SCENE_MODE_DISABLED);
+
/*
* statistics.*
*/
diff --git a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
index 2e6b9ae..c0b7967 100644
--- a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
+++ b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
@@ -339,6 +339,11 @@
* @see #isOutputSupportedFor(Class)
*/
public <T> Size[] getOutputSizes(Class<T> klass) {
+ // Image reader is "supported", but never for implementation-defined formats; return empty
+ if (android.media.ImageReader.class.isAssignableFrom(klass)) {
+ return new Size[0];
+ }
+
if (isOutputSupportedFor(klass) == false) {
return null;
}
diff --git a/core/java/android/hardware/hdmi/HdmiDeviceInfo.java b/core/java/android/hardware/hdmi/HdmiDeviceInfo.java
index 97da3a2..d8da80e 100644
--- a/core/java/android/hardware/hdmi/HdmiDeviceInfo.java
+++ b/core/java/android/hardware/hdmi/HdmiDeviceInfo.java
@@ -230,7 +230,7 @@
mDeviceType = DEVICE_RESERVED;
mVendorId = 0;
mDevicePowerStatus = HdmiControlManager.POWER_STATUS_UNKNOWN;
- mDisplayName = "MHL";
+ mDisplayName = "Mobile";
mDeviceId = adopterId;
mAdopterId = deviceId;
diff --git a/core/java/android/hardware/location/GeofenceHardware.java b/core/java/android/hardware/location/GeofenceHardware.java
index 2d82cba..7dd105a 100644
--- a/core/java/android/hardware/location/GeofenceHardware.java
+++ b/core/java/android/hardware/location/GeofenceHardware.java
@@ -15,6 +15,7 @@
*/
package android.hardware.location;
+import android.annotation.SystemApi;
import android.location.Location;
import android.os.Build;
import android.os.RemoteException;
@@ -43,7 +44,10 @@
* an appropriate transition would be triggered. The "reasonably confident" parameter
* depends on the hardware system and the positioning algorithms used.
* For instance, {@link #MONITORING_TYPE_GPS_HARDWARE} uses 95% as a confidence level.
+ *
+ * @hide
*/
+@SystemApi
public final class GeofenceHardware {
private IGeofenceHardware mService;
@@ -162,9 +166,7 @@
private HashMap<GeofenceHardwareMonitorCallback, GeofenceHardwareMonitorCallbackWrapper>
mMonitorCallbacks = new HashMap<GeofenceHardwareMonitorCallback,
GeofenceHardwareMonitorCallbackWrapper>();
- /**
- * @hide
- */
+
public GeofenceHardware(IGeofenceHardware service) {
mService = service;
}
diff --git a/core/java/android/hardware/location/GeofenceHardwareCallback.java b/core/java/android/hardware/location/GeofenceHardwareCallback.java
index 6cad3da..a2a7ed0 100644
--- a/core/java/android/hardware/location/GeofenceHardwareCallback.java
+++ b/core/java/android/hardware/location/GeofenceHardwareCallback.java
@@ -16,11 +16,15 @@
package android.hardware.location;
+import android.annotation.SystemApi;
import android.location.Location;
/**
* The callback class associated with the APIs in {@link GeofenceHardware}
+ *
+ * @hide
*/
+@SystemApi
public abstract class GeofenceHardwareCallback {
/**
* The callback called when there is a transition to report for the specific
diff --git a/core/java/android/hardware/location/GeofenceHardwareMonitorCallback.java b/core/java/android/hardware/location/GeofenceHardwareMonitorCallback.java
index f927027..d7daa10 100644
--- a/core/java/android/hardware/location/GeofenceHardwareMonitorCallback.java
+++ b/core/java/android/hardware/location/GeofenceHardwareMonitorCallback.java
@@ -16,12 +16,16 @@
package android.hardware.location;
+import android.annotation.SystemApi;
import android.location.Location;
/**
* The callback class associated with the status change of hardware monitors
* in {@link GeofenceHardware}
+ *
+ * @hide
*/
+@SystemApi
public abstract class GeofenceHardwareMonitorCallback {
/**
* The callback called when the state of a monitoring system changes.
diff --git a/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java b/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java
index 9c460d2..7079237 100644
--- a/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java
+++ b/core/java/android/hardware/location/GeofenceHardwareMonitorEvent.java
@@ -16,13 +16,17 @@
package android.hardware.location;
+import android.annotation.SystemApi;
import android.location.Location;
import android.os.Parcel;
import android.os.Parcelable;
/**
* A class that represents an event for each change in the state of a monitoring system.
+ *
+ * @hide
*/
+@SystemApi
public class GeofenceHardwareMonitorEvent implements Parcelable {
private final int mMonitoringType;
private final int mMonitoringStatus;
diff --git a/core/java/android/hardware/location/GeofenceHardwareRequest.java b/core/java/android/hardware/location/GeofenceHardwareRequest.java
index 887c4ad..68545a8 100644
--- a/core/java/android/hardware/location/GeofenceHardwareRequest.java
+++ b/core/java/android/hardware/location/GeofenceHardwareRequest.java
@@ -16,12 +16,16 @@
package android.hardware.location;
+import android.annotation.SystemApi;
+
/**
* This class represents the characteristics of the geofence.
*
* <p> Use this in conjunction with {@link GeofenceHardware} APIs.
+ *
+ * @hide
*/
-
+@SystemApi
public final class GeofenceHardwareRequest {
static final int GEOFENCE_TYPE_CIRCLE = 0;
private int mType;
diff --git a/core/java/android/net/DhcpResults.java b/core/java/android/net/DhcpResults.java
index 49a307e..71df60a 100644
--- a/core/java/android/net/DhcpResults.java
+++ b/core/java/android/net/DhcpResults.java
@@ -16,13 +16,15 @@
package android.net;
+import android.net.NetworkUtils;
import android.os.Parcelable;
import android.os.Parcel;
import android.text.TextUtils;
import android.util.Log;
import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.net.Inet4Address;
+import java.util.Objects;
/**
* A simple object for retrieving the results of a DHCP request.
@@ -30,38 +32,34 @@
* TODO - remove when DhcpInfo is deprecated. Move the remaining api to LinkProperties.
* @hide
*/
-public class DhcpResults implements Parcelable {
+public class DhcpResults extends StaticIpConfiguration {
private static final String TAG = "DhcpResults";
- public final LinkProperties linkProperties;
-
public InetAddress serverAddress;
- /**
- * Vendor specific information (from RFC 2132).
- */
+ /** Vendor specific information (from RFC 2132). */
public String vendorInfo;
public int leaseDuration;
public DhcpResults() {
- linkProperties = new LinkProperties();
+ super();
+ }
+
+ public DhcpResults(StaticIpConfiguration source) {
+ super(source);
}
/** copy constructor */
public DhcpResults(DhcpResults source) {
- if (source != null) {
- linkProperties = new LinkProperties(source.linkProperties);
- serverAddress = source.serverAddress;
- leaseDuration = source.leaseDuration;
- vendorInfo = source.vendorInfo;
- } else {
- linkProperties = new LinkProperties();
- }
- }
+ super(source);
- public DhcpResults(LinkProperties lp) {
- linkProperties = new LinkProperties(lp);
+ if (source != null) {
+ // All these are immutable, so no need to make copies.
+ serverAddress = source.serverAddress;
+ vendorInfo = source.vendorInfo;
+ leaseDuration = source.leaseDuration;
+ }
}
/**
@@ -70,14 +68,10 @@
* being empty.
*/
public void updateFromDhcpRequest(DhcpResults orig) {
- if (orig == null || orig.linkProperties == null) return;
- if (linkProperties.getRoutes().size() == 0) {
- for (RouteInfo r : orig.linkProperties.getRoutes()) linkProperties.addRoute(r);
- }
- if (linkProperties.getDnsServers().size() == 0) {
- for (InetAddress d : orig.linkProperties.getDnsServers()) {
- linkProperties.addDnsServer(d);
- }
+ if (orig == null) return;
+ if (gateway == null) gateway = orig.gateway;
+ if (dnsServers.size() == 0) {
+ dnsServers.addAll(orig.dnsServers);
}
}
@@ -94,15 +88,14 @@
}
public void clear() {
- linkProperties.clear();
- serverAddress = null;
+ super.clear();
vendorInfo = null;
leaseDuration = 0;
}
@Override
public String toString() {
- StringBuffer str = new StringBuffer(linkProperties.toString());
+ StringBuffer str = new StringBuffer(super.toString());
str.append(" DHCP server ").append(serverAddress);
str.append(" Vendor info ").append(vendorInfo);
@@ -119,58 +112,19 @@
DhcpResults target = (DhcpResults)obj;
- if (linkProperties == null) {
- if (target.linkProperties != null) return false;
- } else if (!linkProperties.equals(target.linkProperties)) return false;
- if (serverAddress == null) {
- if (target.serverAddress != null) return false;
- } else if (!serverAddress.equals(target.serverAddress)) return false;
- if (vendorInfo == null) {
- if (target.vendorInfo != null) return false;
- } else if (!vendorInfo.equals(target.vendorInfo)) return false;
- if (leaseDuration != target.leaseDuration) return false;
-
- return true;
- }
-
- /** Implement the Parcelable interface */
- public int describeContents() {
- return 0;
- }
-
- /** Implement the Parcelable interface */
- public void writeToParcel(Parcel dest, int flags) {
- linkProperties.writeToParcel(dest, flags);
-
- dest.writeInt(leaseDuration);
-
- if (serverAddress != null) {
- dest.writeByte((byte)1);
- dest.writeByteArray(serverAddress.getAddress());
- } else {
- dest.writeByte((byte)0);
- }
-
- dest.writeString(vendorInfo);
+ return super.equals((StaticIpConfiguration) obj) &&
+ Objects.equals(serverAddress, target.serverAddress) &&
+ Objects.equals(vendorInfo, target.vendorInfo) &&
+ leaseDuration == target.leaseDuration;
}
/** Implement the Parcelable interface */
public static final Creator<DhcpResults> CREATOR =
new Creator<DhcpResults>() {
public DhcpResults createFromParcel(Parcel in) {
- DhcpResults prop = new DhcpResults((LinkProperties)in.readParcelable(null));
-
- prop.leaseDuration = in.readInt();
-
- if (in.readByte() == 1) {
- try {
- prop.serverAddress = InetAddress.getByAddress(in.createByteArray());
- } catch (UnknownHostException e) {}
- }
-
- prop.vendorInfo = in.readString();
-
- return prop;
+ DhcpResults dhcpResults = new DhcpResults();
+ readFromParcel(dhcpResults, in);
+ return dhcpResults;
}
public DhcpResults[] newArray(int size) {
@@ -178,33 +132,39 @@
}
};
- // Utils for jni population - false on success
- public void setInterfaceName(String interfaceName) {
- linkProperties.setInterfaceName(interfaceName);
+ /** Implement the Parcelable interface */
+ public void writeToParcel(Parcel dest, int flags) {
+ super.writeToParcel(dest, flags);
+ dest.writeInt(leaseDuration);
+ NetworkUtils.parcelInetAddress(dest, serverAddress, flags);
+ dest.writeString(vendorInfo);
}
- public boolean addLinkAddress(String addrString, int prefixLength) {
- InetAddress addr;
+ private static void readFromParcel(DhcpResults dhcpResults, Parcel in) {
+ StaticIpConfiguration.readFromParcel(dhcpResults, in);
+ dhcpResults.leaseDuration = in.readInt();
+ dhcpResults.serverAddress = NetworkUtils.unparcelInetAddress(in);
+ dhcpResults.vendorInfo = in.readString();
+ }
+
+ // Utils for jni population - false on success
+ // Not part of the superclass because they're only used by the JNI iterface to the DHCP daemon.
+ public boolean setIpAddress(String addrString, int prefixLength) {
try {
- addr = NetworkUtils.numericToInetAddress(addrString);
- } catch (IllegalArgumentException e) {
- Log.e(TAG, "addLinkAddress failed with addrString " + addrString);
+ Inet4Address addr = (Inet4Address) NetworkUtils.numericToInetAddress(addrString);
+ ipAddress = new LinkAddress(addr, prefixLength);
+ } catch (IllegalArgumentException|ClassCastException e) {
+ Log.e(TAG, "setIpAddress failed with addrString " + addrString + "/" + prefixLength);
return true;
}
-
- LinkAddress linkAddress = new LinkAddress(addr, prefixLength);
- linkProperties.addLinkAddress(linkAddress);
-
- RouteInfo routeInfo = new RouteInfo(linkAddress);
- linkProperties.addRoute(routeInfo);
return false;
}
- public boolean addGateway(String addrString) {
+ public boolean setGateway(String addrString) {
try {
- linkProperties.addRoute(new RouteInfo(NetworkUtils.numericToInetAddress(addrString)));
+ gateway = NetworkUtils.numericToInetAddress(addrString);
} catch (IllegalArgumentException e) {
- Log.e(TAG, "addGateway failed with addrString " + addrString);
+ Log.e(TAG, "setGateway failed with addrString " + addrString);
return true;
}
return false;
@@ -213,7 +173,7 @@
public boolean addDns(String addrString) {
if (TextUtils.isEmpty(addrString) == false) {
try {
- linkProperties.addDnsServer(NetworkUtils.numericToInetAddress(addrString));
+ dnsServers.add(NetworkUtils.numericToInetAddress(addrString));
} catch (IllegalArgumentException e) {
Log.e(TAG, "addDns failed with addrString " + addrString);
return true;
@@ -241,6 +201,6 @@
}
public void setDomains(String domains) {
- linkProperties.setDomains(domains);
+ domains = domains;
}
}
diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java
index 608ca28..d965f27 100644
--- a/core/java/android/net/EthernetManager.java
+++ b/core/java/android/net/EthernetManager.java
@@ -21,7 +21,6 @@
import android.net.IpConfiguration;
import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings;
-import android.net.LinkProperties;
import android.os.RemoteException;
/**
@@ -52,16 +51,12 @@
*/
public IpConfiguration getConfiguration() {
if (mService == null) {
- return new IpConfiguration(IpAssignment.UNASSIGNED,
- ProxySettings.UNASSIGNED,
- new LinkProperties());
+ return new IpConfiguration();
}
try {
return mService.getConfiguration();
} catch (RemoteException e) {
- return new IpConfiguration(IpAssignment.UNASSIGNED,
- ProxySettings.UNASSIGNED,
- new LinkProperties());
+ return new IpConfiguration();
}
}
diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java
index 4730bab..fe69f296 100644
--- a/core/java/android/net/IpConfiguration.java
+++ b/core/java/android/net/IpConfiguration.java
@@ -16,7 +16,7 @@
package android.net;
-import android.net.LinkProperties;
+import android.net.StaticIpConfiguration;
import android.os.Parcel;
import android.os.Parcelable;
@@ -31,7 +31,7 @@
public enum IpAssignment {
/* Use statically configured IP settings. Configuration can be accessed
- * with linkProperties */
+ * with staticIpConfiguration */
STATIC,
/* Use dynamically configured IP settigns */
DHCP,
@@ -42,12 +42,14 @@
public IpAssignment ipAssignment;
+ public StaticIpConfiguration staticIpConfiguration;
+
public enum ProxySettings {
/* No proxy is to be used. Any existing proxy settings
* should be cleared. */
NONE,
/* Use statically configured proxy. Configuration can be accessed
- * with linkProperties */
+ * with httpProxy. */
STATIC,
/* no proxy details are assigned, this is used to indicate
* that any existing proxy settings should be retained */
@@ -59,30 +61,69 @@
public ProxySettings proxySettings;
- public LinkProperties linkProperties;
+ public ProxyInfo httpProxy;
- public IpConfiguration(IpConfiguration source) {
- if (source != null) {
- ipAssignment = source.ipAssignment;
- proxySettings = source.proxySettings;
- linkProperties = new LinkProperties(source.linkProperties);
- } else {
- ipAssignment = IpAssignment.UNASSIGNED;
- proxySettings = ProxySettings.UNASSIGNED;
- linkProperties = new LinkProperties();
- }
+ private void init(IpAssignment ipAssignment,
+ ProxySettings proxySettings,
+ StaticIpConfiguration staticIpConfiguration,
+ ProxyInfo httpProxy) {
+ this.ipAssignment = ipAssignment;
+ this.proxySettings = proxySettings;
+ this.staticIpConfiguration = (staticIpConfiguration == null) ?
+ null : new StaticIpConfiguration(staticIpConfiguration);
+ this.httpProxy = (httpProxy == null) ?
+ null : new ProxyInfo(httpProxy);
}
public IpConfiguration() {
- this(null);
+ init(IpAssignment.UNASSIGNED, ProxySettings.UNASSIGNED, null, null);
}
public IpConfiguration(IpAssignment ipAssignment,
ProxySettings proxySettings,
- LinkProperties linkProperties) {
+ StaticIpConfiguration staticIpConfiguration,
+ ProxyInfo httpProxy) {
+ init(ipAssignment, proxySettings, staticIpConfiguration, httpProxy);
+ }
+
+ public IpConfiguration(IpConfiguration source) {
+ this();
+ if (source != null) {
+ init(source.ipAssignment, source.proxySettings,
+ source.staticIpConfiguration, source.httpProxy);
+ }
+ }
+
+ public IpAssignment getIpAssignment() {
+ return ipAssignment;
+ }
+
+ public void setIpAssignment(IpAssignment ipAssignment) {
this.ipAssignment = ipAssignment;
+ }
+
+ public StaticIpConfiguration getStaticIpConfiguration() {
+ return staticIpConfiguration;
+ }
+
+ public void setStaticIpConfiguration(StaticIpConfiguration staticIpConfiguration) {
+ this.staticIpConfiguration = staticIpConfiguration;
+ }
+
+ public ProxySettings getProxySettings() {
+ return proxySettings;
+ }
+
+ public void setProxySettings(ProxySettings proxySettings) {
this.proxySettings = proxySettings;
- this.linkProperties = new LinkProperties(linkProperties);
+ }
+
+ public ProxyInfo getHttpProxy() {
+ return httpProxy;
+ }
+
+ public void setHttpProxy(ProxyInfo httpProxy) {
+ this.httpProxy = httpProxy;
}
@Override
@@ -90,10 +131,16 @@
StringBuilder sbuf = new StringBuilder();
sbuf.append("IP assignment: " + ipAssignment.toString());
sbuf.append("\n");
+ if (staticIpConfiguration != null) {
+ sbuf.append("Static configuration: " + staticIpConfiguration.toString());
+ sbuf.append("\n");
+ }
sbuf.append("Proxy settings: " + proxySettings.toString());
sbuf.append("\n");
- sbuf.append(linkProperties.toString());
- sbuf.append("\n");
+ if (httpProxy != null) {
+ sbuf.append("HTTP proxy: " + httpProxy.toString());
+ sbuf.append("\n");
+ }
return sbuf.toString();
}
@@ -111,14 +158,16 @@
IpConfiguration other = (IpConfiguration) o;
return this.ipAssignment == other.ipAssignment &&
this.proxySettings == other.proxySettings &&
- Objects.equals(this.linkProperties, other.linkProperties);
+ Objects.equals(this.staticIpConfiguration, other.staticIpConfiguration) &&
+ Objects.equals(this.httpProxy, other.httpProxy);
}
@Override
public int hashCode() {
- return 13 + (linkProperties != null ? linkProperties.hashCode() : 0) +
+ return 13 + (staticIpConfiguration != null ? staticIpConfiguration.hashCode() : 0) +
17 * ipAssignment.ordinal() +
- 47 * proxySettings.ordinal();
+ 47 * proxySettings.ordinal() +
+ 83 * httpProxy.hashCode();
}
/** Implement the Parcelable interface */
@@ -130,7 +179,8 @@
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(ipAssignment.name());
dest.writeString(proxySettings.name());
- dest.writeParcelable(linkProperties, flags);
+ dest.writeParcelable(staticIpConfiguration, flags);
+ dest.writeParcelable(httpProxy, flags);
}
/** Implement the Parcelable interface */
@@ -140,7 +190,8 @@
IpConfiguration config = new IpConfiguration();
config.ipAssignment = IpAssignment.valueOf(in.readString());
config.proxySettings = ProxySettings.valueOf(in.readString());
- config.linkProperties = in.readParcelable(null);
+ config.staticIpConfiguration = in.readParcelable(null);
+ config.httpProxy = in.readParcelable(null);
return config;
}
diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index 663aa15..54d8676 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.Locale;
+import android.os.Parcel;
import android.util.Log;
import android.util.Pair;
@@ -203,6 +204,32 @@
}
/**
+ * Writes an InetAddress to a parcel. The address may be null. This is likely faster than
+ * calling writeSerializable.
+ */
+ protected static void parcelInetAddress(Parcel parcel, InetAddress address, int flags) {
+ byte[] addressArray = (address != null) ? address.getAddress() : null;
+ parcel.writeByteArray(addressArray);
+ }
+
+ /**
+ * Reads an InetAddress from a parcel. Returns null if the address that was written was null
+ * or if the data is invalid.
+ */
+ protected static InetAddress unparcelInetAddress(Parcel in) {
+ byte[] addressArray = in.createByteArray();
+ if (addressArray == null) {
+ return null;
+ }
+ try {
+ return InetAddress.getByAddress(addressArray);
+ } catch (UnknownHostException e) {
+ return null;
+ }
+ }
+
+
+ /**
* Masks a raw IP address byte array with the specified prefix length.
*/
public static void maskRawAddress(byte[] array, int prefixLength) {
diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
new file mode 100644
index 0000000..5a273cf
--- /dev/null
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import android.net.LinkAddress;
+import android.os.Parcelable;
+import android.os.Parcel;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Class that describes static IP configuration.
+ *
+ * This class is different from LinkProperties because it represents
+ * configuration intent. The general contract is that if we can represent
+ * a configuration here, then we should be able to configure it on a network.
+ * The intent is that it closely match the UI we have for configuring networks.
+ *
+ * In contrast, LinkProperties represents current state. It is much more
+ * expressive. For example, it supports multiple IP addresses, multiple routes,
+ * stacked interfaces, and so on. Because LinkProperties is so expressive,
+ * using it to represent configuration intent as well as current state causes
+ * problems. For example, we could unknowingly save a configuration that we are
+ * not in fact capable of applying, or we could save a configuration that the
+ * UI cannot display, which has the potential for malicious code to hide
+ * hostile or unexpected configuration from the user: see, for example,
+ * http://b/12663469 and http://b/16893413 .
+ *
+ * @hide
+ */
+public class StaticIpConfiguration implements Parcelable {
+ public LinkAddress ipAddress;
+ public InetAddress gateway;
+ public final ArrayList<InetAddress> dnsServers;
+ public String domains;
+
+ public StaticIpConfiguration() {
+ dnsServers = new ArrayList<InetAddress>();
+ }
+
+ public StaticIpConfiguration(StaticIpConfiguration source) {
+ this();
+ if (source != null) {
+ // All of these except dnsServers are immutable, so no need to make copies.
+ ipAddress = source.ipAddress;
+ gateway = source.gateway;
+ dnsServers.addAll(source.dnsServers);
+ domains = source.domains;
+ }
+ }
+
+ public void clear() {
+ ipAddress = null;
+ gateway = null;
+ dnsServers.clear();
+ domains = null;
+ }
+
+ /**
+ * Returns the network routes specified by this object. Will typically include a
+ * directly-connected route for the IP address's local subnet and a default route.
+ */
+ public List<RouteInfo> getRoutes(String iface) {
+ List<RouteInfo> routes = new ArrayList<RouteInfo>(2);
+ if (ipAddress != null) {
+ routes.add(new RouteInfo(ipAddress, null, iface));
+ }
+ if (gateway != null) {
+ routes.add(new RouteInfo((LinkAddress) null, gateway, iface));
+ }
+ return routes;
+ }
+
+ /**
+ * Returns a LinkProperties object expressing the data in this object. Note that the information
+ * contained in the LinkProperties will not be a complete picture of the link's configuration,
+ * because any configuration information that is obtained dynamically by the network (e.g.,
+ * IPv6 configuration) will not be included.
+ */
+ public LinkProperties toLinkProperties(String iface) {
+ LinkProperties lp = new LinkProperties();
+ lp.setInterfaceName(iface);
+ if (ipAddress != null) {
+ lp.addLinkAddress(ipAddress);
+ }
+ for (RouteInfo route : getRoutes(iface)) {
+ lp.addRoute(route);
+ }
+ for (InetAddress dns : dnsServers) {
+ lp.addDnsServer(dns);
+ }
+ return lp;
+ }
+
+ public String toString() {
+ StringBuffer str = new StringBuffer();
+
+ str.append("IP address ");
+ if (ipAddress != null ) str.append(ipAddress).append(" ");
+
+ str.append("Gateway ");
+ if (gateway != null) str.append(gateway.getHostAddress()).append(" ");
+
+ str.append(" DNS servers: [");
+ for (InetAddress dnsServer : dnsServers) {
+ str.append(" ").append(dnsServer.getHostAddress());
+ }
+
+ str.append(" ] Domains");
+ if (domains != null) str.append(domains);
+ return str.toString();
+ }
+
+ public int hashCode() {
+ int result = 13;
+ result = 47 * result + (ipAddress == null ? 0 : ipAddress.hashCode());
+ result = 47 * result + (gateway == null ? 0 : gateway.hashCode());
+ result = 47 * result + (domains == null ? 0 : domains.hashCode());
+ result = 47 * result + dnsServers.hashCode();
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (!(obj instanceof StaticIpConfiguration)) return false;
+
+ StaticIpConfiguration other = (StaticIpConfiguration) obj;
+
+ return other != null &&
+ Objects.equals(ipAddress, other.ipAddress) &&
+ Objects.equals(gateway, other.gateway) &&
+ dnsServers.equals(other.dnsServers) &&
+ Objects.equals(domains, other.domains);
+ }
+
+ /** Implement the Parcelable interface */
+ public static Creator<StaticIpConfiguration> CREATOR =
+ new Creator<StaticIpConfiguration>() {
+ public StaticIpConfiguration createFromParcel(Parcel in) {
+ StaticIpConfiguration s = new StaticIpConfiguration();
+ readFromParcel(s, in);
+ return s;
+ }
+
+ public StaticIpConfiguration[] newArray(int size) {
+ return new StaticIpConfiguration[size];
+ }
+ };
+
+ /** Implement the Parcelable interface */
+ public int describeContents() {
+ return 0;
+ }
+
+ /** Implement the Parcelable interface */
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeParcelable(ipAddress, flags);
+ NetworkUtils.parcelInetAddress(dest, gateway, flags);
+ dest.writeInt(dnsServers.size());
+ for (InetAddress dnsServer : dnsServers) {
+ NetworkUtils.parcelInetAddress(dest, dnsServer, flags);
+ }
+ }
+
+ protected static void readFromParcel(StaticIpConfiguration s, Parcel in) {
+ s.ipAddress = in.readParcelable(null);
+ s.gateway = NetworkUtils.unparcelInetAddress(in);
+ s.dnsServers.clear();
+ int size = in.readInt();
+ for (int i = 0; i < size; i++) {
+ s.dnsServers.add(NetworkUtils.unparcelInetAddress(in));
+ }
+ }
+}
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index be46bc7..fe9f79b 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -3065,7 +3065,7 @@
"partial", which, linePrefix);
linePrefix = printWakeLock(sb, wl.getWakeTime(WAKE_TYPE_WINDOW), rawRealtime,
"window", which, linePrefix);
- if (!linePrefix.equals(": ")) {
+ if (true || !linePrefix.equals(": ")) {
sb.append(" realtime");
// Only print out wake locks that were held
pw.println(sb.toString());
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 9d1a7bc..5189155 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -973,7 +973,7 @@
if (badgeLocation != null) {
if (badgeLocation.left < 0 || badgeLocation.top < 0
- || badgeLocation.right > badgedWidth || badgeLocation.bottom > badgedHeight) {
+ || badgeLocation.width() > badgedWidth || badgeLocation.height() > badgedHeight) {
throw new IllegalArgumentException("Badge location " + badgeLocation
+ " not in badged drawable bounds "
+ new Rect(0, 0, badgedWidth, badgedHeight));
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 68b91cb..4cdafe1 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -619,6 +619,16 @@
private static final long DEFAULT_FULL_THRESHOLD_BYTES = MB_IN_BYTES;
/**
+ * Return the number of available bytes until the given path is considered
+ * running low on storage.
+ *
+ * @hide
+ */
+ public long getStorageBytesUntilLow(File path) {
+ return path.getUsableSpace() - getStorageFullBytes(path);
+ }
+
+ /**
* Return the number of available bytes at which the given path is
* considered running low on storage.
*
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 20e26e6..5e77d28 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3546,6 +3546,13 @@
public static final String DISABLED_SYSTEM_INPUT_METHODS = "disabled_system_input_methods";
/**
+ * Whether to show the IME when a hard keyboard is connected. This is a boolean that
+ * determines if the IME should be shown when a hard keyboard is attached.
+ * @hide
+ */
+ public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard";
+
+ /**
* Host name and port for global http proxy. Uses ':' seperator for
* between host and port.
*
@@ -5183,6 +5190,12 @@
public static final String ADB_ENABLED = "adb_enabled";
/**
+ * Whether Views are allowed to save their attribute data.
+ * @hide
+ */
+ public static final String DEBUG_VIEW_ATTRIBUTES = "debug_view_attributes";
+
+ /**
* Whether assisted GPS should be enabled or not.
* @hide
*/
diff --git a/core/java/android/transition/ChangeImageTransform.java b/core/java/android/transition/ChangeImageTransform.java
index 2b26756..4b230eb 100644
--- a/core/java/android/transition/ChangeImageTransform.java
+++ b/core/java/android/transition/ChangeImageTransform.java
@@ -182,6 +182,7 @@
if (endMatrix == null) {
endMatrix = Matrix.IDENTITY_MATRIX;
}
+ ANIMATED_TRANSFORM_PROPERTY.set(imageView, startMatrix);
animator = createMatrixAnimator(imageView, startMatrix, endMatrix);
}
return animator;
diff --git a/core/java/android/transition/TransitionSet.java b/core/java/android/transition/TransitionSet.java
index 83c60af..68af2d1 100644
--- a/core/java/android/transition/TransitionSet.java
+++ b/core/java/android/transition/TransitionSet.java
@@ -151,6 +151,31 @@
}
/**
+ * Returns the number of child transitions in the TransitionSet.
+ *
+ * @return The number of child transitions in the TransitionSet.
+ * @see #addTransition(Transition)
+ * @see #getTransitionAt(int)
+ */
+ public int getTransitionCount() {
+ return mTransitions.size();
+ }
+
+ /**
+ * Returns the child Transition at the specified position in the TransitionSet.
+ *
+ * @param index The position of the Transition to retrieve.
+ * @see #addTransition(Transition)
+ * @see #getTransitionCount()
+ */
+ public Transition getTransitionAt(int index) {
+ if (index < 0 || index >= mTransitions.size()) {
+ return null;
+ }
+ return mTransitions.get(index);
+ }
+
+ /**
* Setting a non-negative duration on a TransitionSet causes all of the child
* transitions (current and future) to inherit this duration.
*
diff --git a/core/java/android/view/MenuItem.java b/core/java/android/view/MenuItem.java
index 2dfbcb5..e706c9c 100644
--- a/core/java/android/view/MenuItem.java
+++ b/core/java/android/view/MenuItem.java
@@ -258,8 +258,8 @@
/**
* Change both the numeric and alphabetic shortcut associated with this
* item. Note that the shortcut will be triggered when the key that
- * generates the given character is pressed alone or along with with the alt
- * key. Also note that case is not significant and that alphabetic shortcut
+ * generates the given character is pressed along with the ctrl key.
+ * Also note that case is not significant and that alphabetic shortcut
* characters will be displayed in lower case.
* <p>
* See {@link Menu} for the menu types that support shortcuts.
@@ -293,9 +293,9 @@
/**
* Change the alphabetic shortcut associated with this item. The shortcut
* will be triggered when the key that generates the given character is
- * pressed alone or along with with the alt key. Case is not significant and
- * shortcut characters will be displayed in lower case. Note that menu items
- * with the characters '\b' or '\n' as shortcuts will get triggered by the
+ * pressed along with the ctrl key. Case is not significant and shortcut
+ * characters will be displayed in lower case. Note that menu items with
+ * the characters '\b' or '\n' as shortcuts will get triggered by the
* Delete key or Carriage Return key, respectively.
* <p>
* See {@link Menu} for the menu types that support shortcuts.
@@ -596,4 +596,4 @@
* @return This menu item instance for call chaining
*/
public MenuItem setOnActionExpandListener(OnActionExpandListener listener);
-}
\ No newline at end of file
+}
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index e56581b..cec7e63 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -700,6 +700,13 @@
public static final String DEBUG_LAYOUT_PROPERTY = "debug.layout";
/**
+ * When set to true, this view will save its attribute data.
+ *
+ * @hide
+ */
+ public static boolean mDebugViewAttributes = false;
+
+ /**
* Used to mark a View that has no ID.
*/
public static final int NO_ID = -1;
@@ -3254,6 +3261,7 @@
* This field should be made private, so it is hidden from the SDK.
* {@hide}
*/
+ @ViewDebug.ExportedProperty(deepExport = true)
protected Context mContext;
private final Resources mResources;
@@ -3524,6 +3532,18 @@
GhostView mGhostView;
/**
+ * Holds pairs of adjacent attribute data: attribute name followed by its value.
+ * @hide
+ */
+ @ViewDebug.ExportedProperty(category = "attributes", hasAdjacentMapping = true)
+ public String[] mAttributes;
+
+ /**
+ * Maps a Resource id to its name.
+ */
+ private static SparseArray<String> mAttributeMap;
+
+ /**
* Simple constructor to use when creating a view from code.
*
* @param context The Context the view is running in, through which it can
@@ -3641,6 +3661,10 @@
final TypedArray a = context.obtainStyledAttributes(
attrs, com.android.internal.R.styleable.View, defStyleAttr, defStyleRes);
+ if (mDebugViewAttributes) {
+ saveAttributeData(attrs, a);
+ }
+
Drawable background = null;
int leftPadding = -1;
@@ -4136,6 +4160,51 @@
mRenderNode = RenderNode.create(getClass().getName());
}
+ private static SparseArray<String> getAttributeMap() {
+ if (mAttributeMap == null) {
+ mAttributeMap = new SparseArray<String>();
+ }
+ return mAttributeMap;
+ }
+
+ private void saveAttributeData(AttributeSet attrs, TypedArray a) {
+ int length = ((attrs == null ? 0 : attrs.getAttributeCount()) + a.getIndexCount()) * 2;
+ mAttributes = new String[length];
+
+ int i = 0;
+ if (attrs != null) {
+ for (i = 0; i < attrs.getAttributeCount(); i += 2) {
+ mAttributes[i] = attrs.getAttributeName(i);
+ mAttributes[i + 1] = attrs.getAttributeValue(i);
+ }
+
+ }
+
+ SparseArray<String> attributeMap = getAttributeMap();
+ for (int j = 0; j < a.length(); ++j) {
+ if (a.hasValue(j)) {
+ try {
+ int resourceId = a.getResourceId(j, 0);
+ if (resourceId == 0) {
+ continue;
+ }
+
+ String resourceName = attributeMap.get(resourceId);
+ if (resourceName == null) {
+ resourceName = a.getResources().getResourceName(resourceId);
+ attributeMap.put(resourceId, resourceName);
+ }
+
+ mAttributes[i] = resourceName;
+ mAttributes[i + 1] = a.getText(j).toString();
+ i += 2;
+ } catch (Resources.NotFoundException e) {
+ // if we can't get the resource name, we just ignore it
+ }
+ }
+ }
+ }
+
public String toString() {
StringBuilder out = new StringBuilder(128);
out.append(getClass().getName());
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index 4d9a8cc..6c66eb0 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -187,6 +187,15 @@
* @return true if the supported values should be formatted as a hex string.
*/
boolean formatToHexString() default false;
+
+ /**
+ * Indicates whether or not the key to value mappings are held in adjacent indices.
+ *
+ * Note: Applies only to fields and methods that return String[].
+ *
+ * @return true if the key to value mappings are held in adjacent indices.
+ */
+ boolean hasAdjacentMapping() default false;
}
/**
@@ -1056,7 +1065,6 @@
Class<?> klass, String prefix) throws IOException {
final Method[] methods = getExportedPropertyMethods(klass);
-
int count = methods.length;
for (int i = 0; i < count; i++) {
final Method method = methods[i];
@@ -1108,6 +1116,19 @@
exportUnrolledArray(context, out, property, array, valuePrefix, suffix);
continue;
+ } else if (returnType == String[].class) {
+ final String[] array = (String[]) methodValue;
+ if (property.hasAdjacentMapping() && array != null) {
+ for (int j = 0; j < array.length; j += 2) {
+ if (array[j] != null) {
+ writeEntry(out, categoryPrefix + prefix, array[j], "()",
+ array[j + 1] == null ? "null" : array[j + 1]);
+ }
+
+ }
+ }
+
+ continue;
} else if (!returnType.isPrimitive()) {
if (property.deepExport()) {
dumpViewProperties(context, methodValue, out, prefix + property.prefix());
@@ -1187,6 +1208,18 @@
exportUnrolledArray(context, out, property, array, valuePrefix, suffix);
continue;
+ } else if (type == String[].class) {
+ final String[] array = (String[]) field.get(view);
+ if (property.hasAdjacentMapping() && array != null) {
+ for (int j = 0; j < array.length; j += 2) {
+ if (array[j] != null) {
+ writeEntry(out, categoryPrefix + prefix, array[j], "",
+ array[j + 1] == null ? "null" : array[j + 1]);
+ }
+ }
+ }
+
+ continue;
} else if (!type.isPrimitive()) {
if (property.deepExport()) {
dumpViewProperties(context, field.get(view), out, prefix +
diff --git a/core/java/android/view/WindowCallbackWrapper.java b/core/java/android/view/WindowCallbackWrapper.java
new file mode 100644
index 0000000..35a6a76
--- /dev/null
+++ b/core/java/android/view/WindowCallbackWrapper.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package android.view;
+
+import android.view.accessibility.AccessibilityEvent;
+
+/**
+ * A simple decorator stub for Window.Callback that passes through any calls
+ * to the wrapped instance as a base implementation. Call super.foo() to call into
+ * the wrapped callback for any subclasses.
+ *
+ * @hide for internal use
+ */
+public class WindowCallbackWrapper implements Window.Callback {
+ private Window.Callback mWrapped;
+
+ public WindowCallbackWrapper(Window.Callback wrapped) {
+ if (wrapped == null) {
+ throw new IllegalArgumentException("Window callback may not be null");
+ }
+ mWrapped = wrapped;
+ }
+
+ @Override
+ public boolean dispatchKeyEvent(KeyEvent event) {
+ return mWrapped.dispatchKeyEvent(event);
+ }
+
+ @Override
+ public boolean dispatchKeyShortcutEvent(KeyEvent event) {
+ return mWrapped.dispatchKeyShortcutEvent(event);
+ }
+
+ @Override
+ public boolean dispatchTouchEvent(MotionEvent event) {
+ return mWrapped.dispatchTouchEvent(event);
+ }
+
+ @Override
+ public boolean dispatchTrackballEvent(MotionEvent event) {
+ return mWrapped.dispatchTrackballEvent(event);
+ }
+
+ @Override
+ public boolean dispatchGenericMotionEvent(MotionEvent event) {
+ return mWrapped.dispatchGenericMotionEvent(event);
+ }
+
+ @Override
+ public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
+ return mWrapped.dispatchPopulateAccessibilityEvent(event);
+ }
+
+ @Override
+ public View onCreatePanelView(int featureId) {
+ return mWrapped.onCreatePanelView(featureId);
+ }
+
+ @Override
+ public boolean onCreatePanelMenu(int featureId, Menu menu) {
+ return mWrapped.onCreatePanelMenu(featureId, menu);
+ }
+
+ @Override
+ public boolean onPreparePanel(int featureId, View view, Menu menu) {
+ return mWrapped.onPreparePanel(featureId, view, menu);
+ }
+
+ @Override
+ public boolean onMenuOpened(int featureId, Menu menu) {
+ return mWrapped.onMenuOpened(featureId, menu);
+ }
+
+ @Override
+ public boolean onMenuItemSelected(int featureId, MenuItem item) {
+ return mWrapped.onMenuItemSelected(featureId, item);
+ }
+
+ @Override
+ public void onWindowAttributesChanged(WindowManager.LayoutParams attrs) {
+ mWrapped.onWindowAttributesChanged(attrs);
+ }
+
+ @Override
+ public void onContentChanged() {
+ mWrapped.onContentChanged();
+ }
+
+ @Override
+ public void onWindowFocusChanged(boolean hasFocus) {
+ mWrapped.onWindowFocusChanged(hasFocus);
+ }
+
+ @Override
+ public void onAttachedToWindow() {
+ mWrapped.onAttachedToWindow();
+ }
+
+ @Override
+ public void onDetachedFromWindow() {
+ mWrapped.onDetachedFromWindow();
+ }
+
+ @Override
+ public void onPanelClosed(int featureId, Menu menu) {
+ mWrapped.onPanelClosed(featureId, menu);
+ }
+
+ @Override
+ public boolean onSearchRequested() {
+ return mWrapped.onSearchRequested();
+ }
+
+ @Override
+ public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) {
+ return mWrapped.onWindowStartingActionMode(callback);
+ }
+
+ @Override
+ public void onActionModeStarted(ActionMode mode) {
+ mWrapped.onActionModeStarted(mode);
+ }
+
+ @Override
+ public void onActionModeFinished(ActionMode mode) {
+ mWrapped.onActionModeFinished(mode);
+ }
+}
+
diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java
index c0961fd..06b7a93 100644
--- a/core/java/android/widget/FastScroller.java
+++ b/core/java/android/widget/FastScroller.java
@@ -79,6 +79,7 @@
// Positions for preview image and text.
private static final int OVERLAY_FLOATING = 0;
private static final int OVERLAY_AT_THUMB = 1;
+ private static final int OVERLAY_ABOVE_THUMB = 2;
// Indices for mPreviewResId.
private static final int PREVIEW_LEFT = 0;
@@ -189,8 +190,9 @@
/**
* Position for the preview image and text. One of:
* <ul>
- * <li>{@link #OVERLAY_AT_THUMB}
* <li>{@link #OVERLAY_FLOATING}
+ * <li>{@link #OVERLAY_AT_THUMB}
+ * <li>{@link #OVERLAY_ABOVE_THUMB}
* </ul>
*/
private int mOverlayPosition;
@@ -310,8 +312,10 @@
final int textMinSize = Math.max(0, mPreviewMinHeight);
mPrimaryText.setMinimumWidth(textMinSize);
mPrimaryText.setMinimumHeight(textMinSize);
+ mPrimaryText.setIncludeFontPadding(false);
mSecondaryText.setMinimumWidth(textMinSize);
mSecondaryText.setMinimumHeight(textMinSize);
+ mSecondaryText.setIncludeFontPadding(false);
refreshDrawablePressedState();
}
@@ -595,10 +599,10 @@
margins.right = mPreviewImage.getPaddingRight();
margins.bottom = mPreviewImage.getPaddingBottom();
- if (mOverlayPosition == OVERLAY_AT_THUMB) {
- measureViewToSide(v, mThumbImage, margins, out);
- } else {
+ if (mOverlayPosition == OVERLAY_FLOATING) {
measureFloating(v, margins, out);
+ } else {
+ measureViewToSide(v, mThumbImage, margins, out);
}
}
@@ -1147,11 +1151,23 @@
final float thumbMiddle = position * range + offset;
thumbImage.setTranslationY(thumbMiddle - thumbImage.getHeight() / 2);
- final float previewPos = mOverlayPosition == OVERLAY_AT_THUMB ? thumbMiddle : 0;
-
- // Center the preview on the thumb, constrained to the list bounds.
final View previewImage = mPreviewImage;
final float previewHalfHeight = previewImage.getHeight() / 2f;
+ final float previewPos;
+ switch (mOverlayPosition) {
+ case OVERLAY_AT_THUMB:
+ previewPos = thumbMiddle;
+ break;
+ case OVERLAY_ABOVE_THUMB:
+ previewPos = thumbMiddle - previewHalfHeight;
+ break;
+ case OVERLAY_FLOATING:
+ default:
+ previewPos = 0;
+ break;
+ }
+
+ // Center the preview on the thumb, constrained to the list bounds.
final float minP = top + previewHalfHeight;
final float maxP = bottom - previewHalfHeight;
final float previewMiddle = MathUtils.constrain(previewPos, minP, maxP);
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index 8aef304..05ff151 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -2656,7 +2656,7 @@
if (UserHandle.getUserId(applicationInfo.uid) != userId
|| !applicationInfo.packageName.equals(packageName)) {
try {
- Context context = application.getApplicationContext().createPackageContextAsUser(
+ Context context = application.getBaseContext().createPackageContextAsUser(
packageName, 0, new UserHandle(userId));
applicationInfo = context.getApplicationInfo();
} catch (NameNotFoundException nnfe) {
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index cd922a1..5267811 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -60,6 +60,7 @@
initialIntents[i] = in;
}
}
+ setSafeForwardingMode(true);
super.onCreate(savedInstanceState, target, title, defaultTitleRes, initialIntents,
null, false);
}
diff --git a/core/java/com/android/internal/app/IMediaContainerService.aidl b/core/java/com/android/internal/app/IMediaContainerService.aidl
index 7a3ffdf..81ea191 100644
--- a/core/java/com/android/internal/app/IMediaContainerService.aidl
+++ b/core/java/com/android/internal/app/IMediaContainerService.aidl
@@ -25,10 +25,7 @@
boolean isExternal, boolean isForwardLocked, String abiOverride);
int copyPackage(String packagePath, in IParcelFileDescriptorFactory target);
- PackageInfoLite getMinimalPackageInfo(String packagePath, int flags, long threshold,
- String abiOverride);
- boolean checkInternalFreeStorage(String packagePath, boolean isForwardLocked, long threshold);
- boolean checkExternalFreeStorage(String packagePath, boolean isForwardLocked, String abiOverride);
+ PackageInfoLite getMinimalPackageInfo(String packagePath, int flags, String abiOverride);
ObbInfo getObbInfo(String filename);
long calculateDirectorySize(String directory);
/** Return file system stats: [0] is total bytes, [1] is available bytes */
diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java
index af38b3e..d9493752 100644
--- a/core/java/com/android/internal/app/IntentForwarderActivity.java
+++ b/core/java/com/android/internal/app/IntentForwarderActivity.java
@@ -76,17 +76,19 @@
}
Intent newIntent = new Intent(intentReceived);
newIntent.setComponent(null);
+ // Apps should not be allowed to target a specific package in the target user.
+ newIntent.setPackage(null);
newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT
|Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
int callingUserId = getUserId();
IPackageManager ipm = AppGlobals.getPackageManager();
String resolvedType = newIntent.resolveTypeIfNeeded(getContentResolver());
boolean canForward = false;
+ Intent selector = newIntent.getSelector();
+ if (selector == null) {
+ selector = newIntent;
+ }
try {
- Intent selector = newIntent.getSelector();
- if (selector == null) {
- selector = newIntent;
- }
canForward = ipm.canForwardTo(selector, resolvedType, callingUserId,
userDest.getIdentifier());
} catch (RemoteException e) {
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index b1727fa..636c712 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -17,10 +17,13 @@
package com.android.internal.app;
import android.app.Activity;
+import android.app.ActivityThread;
import android.app.usage.UsageStats;
import android.app.usage.UsageStatsManager;
import android.os.AsyncTask;
+import android.provider.Settings;
import android.util.ArrayMap;
+import android.util.Slog;
import android.widget.AbsListView;
import android.widget.GridView;
import com.android.internal.R;
@@ -83,6 +86,7 @@
private int mLaunchedFromUid;
private ResolveListAdapter mAdapter;
private PackageManager mPm;
+ private boolean mSafeForwardingMode;
private boolean mAlwaysUseOption;
private boolean mShowExtended;
private GridView mGridView;
@@ -175,6 +179,8 @@
titleResource = 0;
}
+ setSafeForwardingMode(true);
+
onCreate(savedInstanceState, intent,
titleResource != 0 ? getResources().getText(titleResource) : null, titleResource,
null, null, true);
@@ -247,7 +253,7 @@
resizeGrid();
} else if (count == 1) {
- startActivity(mAdapter.intentForPosition(0, false));
+ safelyStartActivity(mAdapter.intentForPosition(0, false));
mPackageMonitor.unregister();
mRegistered = false;
finish();
@@ -303,6 +309,22 @@
}
}
+ /**
+ * Turn on launch mode that is safe to use when forwarding intents received from
+ * applications and running in system processes. This mode uses Activity.startActivityAsCaller
+ * instead of the normal Activity.startActivity for launching the activity selected
+ * by the user.
+ *
+ * <p>This mode is set to true by default if the activity is initialized through
+ * {@link #onCreate(android.os.Bundle)}. If a subclass calls one of the other onCreate
+ * methods, it is set to false by default. You must set it before calling one of the
+ * more detailed onCreate methods, so that it will be set correctly in the case where
+ * there is only one intent to resolve and it is thus started immediately.</p>
+ */
+ public void setSafeForwardingMode(boolean safeForwarding) {
+ mSafeForwardingMode = safeForwarding;
+ }
+
protected CharSequence getTitleForAction(String action, int defaultTitleRes) {
final ActionTitle title = ActionTitle.forAction(action);
final boolean named = mAdapter.hasFilteredItem();
@@ -605,12 +627,33 @@
}
if (intent != null) {
+ safelyStartActivity(intent);
+ }
+ }
+
+ public void safelyStartActivity(Intent intent) {
+ if (!mSafeForwardingMode) {
startActivity(intent);
+ return;
+ }
+ try {
+ startActivityAsCaller(intent, null);
+ } catch (RuntimeException e) {
+ String launchedFromPackage;
+ try {
+ launchedFromPackage = ActivityManagerNative.getDefault().getLaunchedFromPackage(
+ getActivityToken());
+ } catch (RemoteException e2) {
+ launchedFromPackage = "??";
+ }
+ Slog.wtf(TAG, "Unable to launch as uid " + mLaunchedFromUid
+ + " package " + launchedFromPackage + ", while running in "
+ + ActivityThread.currentProcessName(), e);
}
}
void showAppDetails(ResolveInfo ri) {
- Intent in = new Intent().setAction("android.settings.APPLICATION_DETAILS_SETTINGS")
+ Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
.setData(Uri.fromParts("package", ri.activityInfo.packageName, null))
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
startActivity(in);
diff --git a/core/java/com/android/internal/app/ToolbarActionBar.java b/core/java/com/android/internal/app/ToolbarActionBar.java
index 96d7192..13eb182 100644
--- a/core/java/com/android/internal/app/ToolbarActionBar.java
+++ b/core/java/com/android/internal/app/ToolbarActionBar.java
@@ -29,6 +29,7 @@
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
+import android.view.WindowCallbackWrapper;
import android.widget.SpinnerAdapter;
import android.widget.Toolbar;
import com.android.internal.view.menu.MenuBuilder;
@@ -40,6 +41,7 @@
public class ToolbarActionBar extends ActionBar {
private Toolbar mToolbar;
private DecorToolbar mDecorToolbar;
+ private boolean mToolbarMenuPrepared;
private Window.Callback mWindowCallback;
private boolean mLastMenuVisibility;
@@ -64,12 +66,16 @@
public ToolbarActionBar(Toolbar toolbar, CharSequence title, Window.Callback windowCallback) {
mToolbar = toolbar;
mDecorToolbar = new ToolbarWidgetWrapper(toolbar, false);
- mWindowCallback = windowCallback;
+ mWindowCallback = new ToolbarCallbackWrapper(windowCallback);
mDecorToolbar.setWindowCallback(mWindowCallback);
toolbar.setOnMenuItemClickListener(mMenuClicker);
mDecorToolbar.setWindowTitle(title);
}
+ public Window.Callback getWrappedWindowCallback() {
+ return mWindowCallback;
+ }
+
@Override
public void setCustomView(View view) {
setCustomView(view, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
@@ -465,4 +471,20 @@
mMenuVisibilityListeners.get(i).onMenuVisibilityChanged(isVisible);
}
}
+
+ private class ToolbarCallbackWrapper extends WindowCallbackWrapper {
+ public ToolbarCallbackWrapper(Window.Callback wrapped) {
+ super(wrapped);
+ }
+
+ @Override
+ public boolean onPreparePanel(int featureId, View view, Menu menu) {
+ final boolean result = super.onPreparePanel(featureId, view, menu);
+ if (result && !mToolbarMenuPrepared) {
+ mDecorToolbar.setMenuPrepared();
+ mToolbarMenuPrepared = true;
+ }
+ return result;
+ }
+ }
}
diff --git a/core/java/com/android/internal/content/PackageHelper.java b/core/java/com/android/internal/content/PackageHelper.java
index eff6684..fd96f64 100644
--- a/core/java/com/android/internal/content/PackageHelper.java
+++ b/core/java/com/android/internal/content/PackageHelper.java
@@ -16,14 +16,21 @@
package com.android.internal.content;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Environment;
import android.os.FileUtils;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.storage.IMountService;
+import android.os.storage.StorageManager;
import android.os.storage.StorageResultCode;
import android.util.Log;
+import libcore.io.IoUtils;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -33,8 +40,6 @@
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
-import libcore.io.IoUtils;
-
/**
* Constants used internally between the PackageManager
* and media container service transports.
@@ -298,4 +303,78 @@
}
return false;
}
+
+ /**
+ * Given a requested {@link PackageInfo#installLocation} and calculated
+ * install size, pick the actual location to install the app.
+ */
+ public static int resolveInstallLocation(Context context, int installLocation, long sizeBytes,
+ int installFlags) {
+ final int prefer;
+ final boolean checkBoth;
+ if ((installFlags & PackageManager.INSTALL_INTERNAL) != 0) {
+ prefer = RECOMMEND_INSTALL_INTERNAL;
+ checkBoth = false;
+ } else if ((installFlags & PackageManager.INSTALL_EXTERNAL) != 0) {
+ prefer = RECOMMEND_INSTALL_EXTERNAL;
+ checkBoth = false;
+ } else if (installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
+ prefer = RECOMMEND_INSTALL_INTERNAL;
+ checkBoth = false;
+ } else if (installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL) {
+ prefer = RECOMMEND_INSTALL_EXTERNAL;
+ checkBoth = true;
+ } else if (installLocation == PackageInfo.INSTALL_LOCATION_AUTO) {
+ prefer = RECOMMEND_INSTALL_INTERNAL;
+ checkBoth = true;
+ } else {
+ prefer = RECOMMEND_INSTALL_INTERNAL;
+ checkBoth = false;
+ }
+
+ final boolean emulated = Environment.isExternalStorageEmulated();
+ final StorageManager storage = StorageManager.from(context);
+
+ boolean fitsOnInternal = false;
+ if (checkBoth || prefer == RECOMMEND_INSTALL_INTERNAL) {
+ fitsOnInternal = (sizeBytes
+ <= storage.getStorageBytesUntilLow(Environment.getDataDirectory()));
+ }
+
+ boolean fitsOnExternal = false;
+ if (!emulated && (checkBoth || prefer == RECOMMEND_INSTALL_EXTERNAL)) {
+ fitsOnExternal = (sizeBytes
+ <= storage.getStorageBytesUntilLow(Environment.getExternalStorageDirectory()));
+ }
+
+ if (prefer == RECOMMEND_INSTALL_INTERNAL) {
+ if (fitsOnInternal) {
+ return PackageHelper.RECOMMEND_INSTALL_INTERNAL;
+ }
+ } else if (!emulated && prefer == RECOMMEND_INSTALL_EXTERNAL) {
+ if (fitsOnExternal) {
+ return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;
+ }
+ }
+
+ if (checkBoth) {
+ if (fitsOnInternal) {
+ return PackageHelper.RECOMMEND_INSTALL_INTERNAL;
+ } else if (!emulated && fitsOnExternal) {
+ return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;
+ }
+ }
+
+ /*
+ * If they requested to be on the external media by default, return that
+ * the media was unavailable. Otherwise, indicate there was insufficient
+ * storage space available.
+ */
+ if (!emulated && (checkBoth || prefer == RECOMMEND_INSTALL_EXTERNAL)
+ && !Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+ return PackageHelper.RECOMMEND_MEDIA_UNAVAILABLE;
+ } else {
+ return PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE;
+ }
+ }
}
diff --git a/core/java/com/android/internal/inputmethod/InputMethodUtils.java b/core/java/com/android/internal/inputmethod/InputMethodUtils.java
index d801571..6eb0099 100644
--- a/core/java/com/android/internal/inputmethod/InputMethodUtils.java
+++ b/core/java/com/android/internal/inputmethod/InputMethodUtils.java
@@ -974,6 +974,16 @@
}
}
+ public boolean isShowImeWithHardKeyboardEnabled() {
+ return Settings.Secure.getIntForUser(mResolver,
+ Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0, mCurrentUserId) == 1;
+ }
+
+ public void setShowImeWithHardKeyboard(boolean show) {
+ Settings.Secure.putIntForUser(mResolver, Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD,
+ show ? 1 : 0, mCurrentUserId);
+ }
+
public int getCurrentUserId() {
return mCurrentUserId;
}
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 6c9766e..299b0e6 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -105,7 +105,7 @@
// The maximum number of names wakelocks we will keep track of
// per uid; once the limit is reached, we batch the remaining wakelocks
// in to one common name.
- private static final int MAX_WAKELOCKS_PER_UID = 50;
+ private static final int MAX_WAKELOCKS_PER_UID = 100;
private static int sNumSpeedSteps;
diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp
index 32cf286..5bd38f3 100644
--- a/core/jni/android_net_NetUtils.cpp
+++ b/core/jni/android_net_NetUtils.cpp
@@ -69,9 +69,8 @@
*/
static struct fieldIds {
jmethodID clear;
- jmethodID setInterfaceName;
- jmethodID addLinkAddress;
- jmethodID addGateway;
+ jmethodID setIpAddress;
+ jmethodID setGateway;
jmethodID addDns;
jmethodID setDomains;
jmethodID setServerAddress;
@@ -130,21 +129,16 @@
if (result == 0) {
env->CallVoidMethod(dhcpResults, dhcpResultsFieldIds.clear);
- // set mIfaceName
- // dhcpResults->setInterfaceName(ifname)
- env->CallVoidMethod(dhcpResults, dhcpResultsFieldIds.setInterfaceName, ifname);
-
// set the linkAddress
// dhcpResults->addLinkAddress(inetAddress, prefixLength)
- result = env->CallBooleanMethod(dhcpResults, dhcpResultsFieldIds.addLinkAddress,
+ result = env->CallBooleanMethod(dhcpResults, dhcpResultsFieldIds.setIpAddress,
env->NewStringUTF(ipaddr), prefixLength);
}
if (result == 0) {
// set the gateway
- // dhcpResults->addGateway(gateway)
result = env->CallBooleanMethod(dhcpResults,
- dhcpResultsFieldIds.addGateway, env->NewStringUTF(gateway));
+ dhcpResultsFieldIds.setGateway, env->NewStringUTF(gateway));
}
if (result == 0) {
@@ -279,12 +273,10 @@
LOG_FATAL_IF(dhcpResultsClass == NULL, "Unable to find class android/net/DhcpResults");
dhcpResultsFieldIds.clear =
env->GetMethodID(dhcpResultsClass, "clear", "()V");
- dhcpResultsFieldIds.setInterfaceName =
- env->GetMethodID(dhcpResultsClass, "setInterfaceName", "(Ljava/lang/String;)V");
- dhcpResultsFieldIds.addLinkAddress =
- env->GetMethodID(dhcpResultsClass, "addLinkAddress", "(Ljava/lang/String;I)Z");
- dhcpResultsFieldIds.addGateway =
- env->GetMethodID(dhcpResultsClass, "addGateway", "(Ljava/lang/String;)Z");
+ dhcpResultsFieldIds.setIpAddress =
+ env->GetMethodID(dhcpResultsClass, "setIpAddress", "(Ljava/lang/String;I)Z");
+ dhcpResultsFieldIds.setGateway =
+ env->GetMethodID(dhcpResultsClass, "setGateway", "(Ljava/lang/String;)Z");
dhcpResultsFieldIds.addDns =
env->GetMethodID(dhcpResultsClass, "addDns", "(Ljava/lang/String;)Z");
dhcpResultsFieldIds.setDomains =
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index aee3090..157147e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1249,13 +1249,13 @@
android:description="@string/permdesc_use_sip"
android:label="@string/permlab_use_sip" />
- <!-- @SystemApi Allows an application to request CallHandlerService implementations.
+ <!-- @SystemApi Allows an application to bind to InCallService implementations.
@hide -->
- <permission android:name="android.permission.BIND_CALL_SERVICE"
+ <permission android:name="android.permission.BIND_INCALL_SERVICE"
android:permissionGroup="android.permission-group.PHONE_CALLS"
android:protectionLevel="system|signature"
- android:description="@string/permdesc_bind_call_service"
- android:label="@string/permlab_bind_call_service" />
+ android:description="@string/permdesc_bind_incall_service"
+ android:label="@string/permlab_bind_incall_service" />
<!-- @SystemApi Allows an application to bind to ConnectionService implementations.
@hide -->
@@ -1265,6 +1265,14 @@
android:description="@string/permdesc_bind_connection_service"
android:label="@string/permlab_bind_connection_service" />
+ <!-- @SystemApi Allows an application to control the in-call experience.
+ @hide -->
+ <permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"
+ android:permissionGroup="android.permission-group.PHONE_CALLS"
+ android:protectionLevel="system|signature"
+ android:description="@string/permdesc_control_incall_experience"
+ android:label="@string/permlab_control_incall_experience" />
+
<!-- ================================== -->
<!-- Permissions for sdcard interaction -->
<!-- ================================== -->
@@ -2811,11 +2819,11 @@
android:description="@string/permdesc_accessDrmCertificates"
android:protectionLevel="signature|system" />
- <!-- Api Allows an application to create media projection sessions.
+ <!-- Api Allows an application to manage media projection sessions.
@hide This is not a third-party API (intended for system apps). -->
- <permission android:name="android.permission.CREATE_MEDIA_PROJECTION"
- android:label="@string/permlab_createMediaProjection"
- android:description="@string/permdesc_createMediaProjection"
+ <permission android:name="android.permission.MANAGE_MEDIA_PROJECTION"
+ android:label="@string/permlab_manageMediaProjection"
+ android:description="@string/permdesc_manageMediaProjection"
android:protectionLevel="signature" />
<!-- @SystemApi Allows an application to read install sessions
diff --git a/core/res/res/drawable/fastscroll_label_left_material.xml b/core/res/res/drawable/fastscroll_label_left_material.xml
new file mode 100644
index 0000000..430d1b0
--- /dev/null
+++ b/core/res/res/drawable/fastscroll_label_left_material.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <corners
+ android:topLeftRadius="44dp"
+ android:topRightRadius="44dp"
+ android:bottomRightRadius="44dp" />
+ <padding
+ android:paddingLeft="22dp"
+ android:paddingRight="22dp" />
+ <solid android:color="?attr/colorControlActivated" />
+</shape>
diff --git a/core/res/res/drawable/fastscroll_label_right_material.xml b/core/res/res/drawable/fastscroll_label_right_material.xml
new file mode 100644
index 0000000..6e61397
--- /dev/null
+++ b/core/res/res/drawable/fastscroll_label_right_material.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <corners
+ android:topLeftRadius="44dp"
+ android:topRightRadius="44dp"
+ android:bottomLeftRadius="44dp" />
+ <padding
+ android:paddingLeft="22dp"
+ android:paddingRight="22dp" />
+ <solid android:color="?attr/colorControlActivated" />
+</shape>
diff --git a/core/res/res/drawable/stat_notify_disabled_data.xml b/core/res/res/drawable/stat_notify_disabled_data.xml
index 2f6ffaf..9089d08 100644
--- a/core/res/res/drawable/stat_notify_disabled_data.xml
+++ b/core/res/res/drawable/stat_notify_disabled_data.xml
@@ -18,17 +18,7 @@
android:height="24dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
-
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M40.709,4.5l-6.604,7.337 0.0,16.601 6.604,6.604z"/>
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M32.305,13.838l-6.0629997,6.7370005 6.0629997,6.0629997z"/>
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M15.498,40.5l0.0,-7.9869995 -7.205,7.9869995z"/>
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M10.265,9.72l-2.5460005,2.545 9.971001,9.971 3.7139988,3.7140007 -4.105999,4.5619984 0.0,9.988001 6.6019993,0.0 0.0,-12.054001 1.8029995,1.8030014 0.0,10.250999 6.602001,0.0 0.0,-3.6479988 1.7999992,1.7999992 1.8479996,1.8479996 4.670002,4.669998 2.5459976,-2.5459976z"/>
+ android:pathData="M26.000000,4.100000l0.000000,6.100000c6.800000,1.000000 12.000000,6.800000 12.000000,13.800000c0.000000,1.800000 -0.400000,3.500000 -1.000000,5.100000l5.200000,3.100000c1.100000,-2.500000 1.800000,-5.200000 1.800000,-8.100000C44.000000,13.600000 36.099998,5.100000 26.000000,4.100000zM24.000000,38.000000c-7.700000,0.000000 -14.000000,-6.300000 -14.000000,-14.000000c0.000000,-7.100000 5.200000,-12.900000 12.000000,-13.800000L22.000000,4.100000C11.900000,5.100000 4.000000,13.600000 4.000000,24.000000c0.000000,11.000000 8.900000,20.000000 20.000000,20.000000c6.600000,0.000000 12.500000,-3.200000 16.100000,-8.200000l-5.200000,-3.100000C32.299999,36.000000 28.400000,38.000000 24.000000,38.000000z"/>
</vector>
diff --git a/core/res/res/layout/alert_dialog_leanback_button_panel_right.xml b/core/res/res/layout/alert_dialog_leanback_button_panel_side.xml
similarity index 80%
rename from core/res/res/layout/alert_dialog_leanback_button_panel_right.xml
rename to core/res/res/layout/alert_dialog_leanback_button_panel_side.xml
index 829d5aa..c6e8b3b 100644
--- a/core/res/res/layout/alert_dialog_leanback_button_panel_right.xml
+++ b/core/res/res/layout/alert_dialog_leanback_button_panel_side.xml
@@ -20,13 +20,7 @@
android:id="@+id/parentPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@drawable/dialog_background_material"
- android:translationZ="@dimen/floating_window_z"
- android:layout_marginLeft="@dimen/leanback_alert_dialog_horizontal_margin"
- android:layout_marginTop="@dimen/leanback_alert_dialog_vertical_margin"
- android:layout_marginRight="@dimen/leanback_alert_dialog_horizontal_margin"
- android:layout_marginBottom="@dimen/leanback_alert_dialog_vertical_margin">
+ android:orientation="horizontal">
<LinearLayout
android:id="@+id/leftPanel"
@@ -46,14 +40,15 @@
android:gravity="center_vertical|start"
android:paddingStart="16dip"
android:paddingEnd="16dip"
- android:paddingTop="16dip">
+ android:paddingTop="16dip"
+ android:paddingBottom="8dip">
<ImageView android:id="@+id/icon"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_marginEnd="8dip"
android:scaleType="fitCenter"
android:src="@null" />
- <TextView android:id="@+id/alertTitle"
+ <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle"
style="?attr/windowTitleStyle"
android:singleLine="true"
android:ellipsize="end"
@@ -81,7 +76,7 @@
android:paddingStart="16dip"
android:paddingEnd="16dip"
android:paddingTop="16dip"
- android:paddingBottom="16dip" />
+ android:paddingBottom="16dip" />
</ScrollView>
</LinearLayout>
@@ -90,41 +85,38 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:minHeight="64dp">
- <FrameLayout android:id="@+android:id/custom"
+ <FrameLayout android:id="@+id/custom"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
</LinearLayout>
<LinearLayout android:id="@+id/buttonPanel"
+ style="?attr/buttonBarStyle"
android:layout_width="wrap_content"
-android:background="#ffffff"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:minHeight="@dimen/alert_dialog_button_bar_height"
+ android:layout_gravity="center_vertical"
android:orientation="vertical"
- android:gravity="end"
- android:padding="16dip">
+ android:gravity="end">
<LinearLayout
- style="?attr/buttonBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layoutDirection="locale"
- android:orientation="vertical">
+ android:orientation="vertical">
<Button android:id="@+id/button3"
- style="?attr/buttonBarButtonStyle"
+ style="?attr/buttonBarNeutralButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
android:minHeight="@dimen/alert_dialog_button_bar_height" />
<Button android:id="@+id/button2"
- style="?attr/buttonBarButtonStyle"
+ style="?attr/buttonBarNegativeButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
android:minHeight="@dimen/alert_dialog_button_bar_height" />
<Button android:id="@+id/button1"
- style="?attr/buttonBarButtonStyle"
+ style="?attr/buttonBarPositiveButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
diff --git a/core/res/res/layout/time_picker_legacy_leanback.xml b/core/res/res/layout/time_picker_legacy_leanback.xml
deleted file mode 100644
index b4e5e3e..0000000
--- a/core/res/res/layout/time_picker_legacy_leanback.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/timePickerLayout"
- android:orientation="horizontal"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingStart="8dip"
- android:paddingEnd="8dip">
-
- <LinearLayout android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingStart="8dip"
- android:paddingEnd="8dip"
- android:layoutDirection="ltr">
-
- <!-- hour -->
- <NumberPicker
- android:id="@+id/hour"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dip"
- android:layout_marginBottom="16dip"
- android:focusable="true"
- android:focusableInTouchMode="true"
- />
-
- <!-- divider -->
- <TextView
- android:id="@+id/divider"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="6dip"
- android:layout_marginEnd="6dip"
- android:layout_gravity="center_vertical"
- android:importantForAccessibility="no"
- />
-
- <!-- minute -->
- <NumberPicker
- android:id="@+id/minute"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dip"
- android:layout_marginBottom="16dip"
- android:focusable="true"
- android:focusableInTouchMode="true"
- />
-
- </LinearLayout>
-
- <!-- AM / PM -->
- <NumberPicker
- android:id="@+id/amPm"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dip"
- android:layout_marginBottom="16dip"
- android:layout_marginStart="8dip"
- android:layout_marginEnd="8dip"
- android:focusable="true"
- android:focusableInTouchMode="true"
- />
-
-</LinearLayout>
diff --git a/core/res/res/values-television/themes.xml b/core/res/res/values-television/themes.xml
index f92ff40..a501fac 100644
--- a/core/res/res/values-television/themes.xml
+++ b/core/res/res/values-television/themes.xml
@@ -20,4 +20,6 @@
<style name="Theme.Holo.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />
<style name="Theme.Material.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />
<style name="Theme.Material.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />
+ <style name="Theme.Material.Dialog" parent="Theme.Leanback.Dialog" />
+ <style name="Theme.Material.Light.Dialog" parent="Theme.Leanback.Light.Dialog" />
</resources>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 89bda82..f9ea5d8 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -733,6 +733,7 @@
<attr name="fastScrollOverlayPosition">
<enum name="floating" value="0" />
<enum name="atThumb" value="1" />
+ <enum name="aboveThumb" value="2" />
</attr>
<!-- Text color for the fast scroll index overlay. Make sure it
plays nicely with fastScrollPreviewBackground[Left|Right]. -->
@@ -3196,6 +3197,8 @@
<enum name="floating" value="0" />
<!-- Pinned alongside the thumb. -->
<enum name="atThumb" value="1" />
+ <!-- Pinned above the thumb. -->
+ <enum name="aboveThumb" value="2" />
</attr>
<attr name="textAppearance" />
<attr name="textColor" />
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 7d4c37e..e905a3a 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -277,17 +277,6 @@
applications can request this feature. Default value is false. -->
<attr name="requiredForAllUsers" format="boolean" />
- <!-- Flag to specifiy for which types of profile this application needs to be present.
- Only pre-installed applications can request this feature. Default is none. -->
- <attr name="requiredForProfile">
- <!-- This application needs to be present for restricted profiles -->
- <flag name="restricted" value="0x0001" />
- <!-- This application needs to be present for managed profiles -->
- <flag name="managed" value="0x0002" />
- <!-- This application needs to be present for all types of profiles -->
- <flag name="all" value="0xFFFF" />
- </attr>
-
<!-- Flag indicating whether the application can be debugged, even when
running on a device that is running in user mode. -->
<attr name="debuggable" format="boolean" />
@@ -1073,7 +1062,6 @@
<attr name="hasCode" format="boolean" />
<attr name="persistent" />
<attr name="requiredForAllUsers" />
- <attr name="requiredForProfile" />
<!-- Specify whether the components in this application are enabled or not (that is, can be
instantiated by the system).
If "false", it overrides any component specific values (a value of "true" will not
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index bf97ca5..f702b95 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1656,4 +1656,11 @@
<!-- Package name providing WebView implementation. -->
<string name="config_webViewPackageName" translatable="false">com.android.webview</string>
+ <!-- If EMS is not supported, framework breaks down EMS into single segment SMS
+ and adds page info " x/y". This config is used to set which carrier doesn't
+ support EMS and whether page info should be added at the beginning or the end.
+ We use tag 'prefix' for position beginning and 'suffix' for position end.
+ Examples: <item>311480;prefix</item> <item>310260;suffix</item>
+ -->
+ <string-array translatable="false" name="no_ems_support_sim_operators" />
</resources>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index c8edad0..27c8207 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2128,8 +2128,7 @@
<public type="attr" name="strokeLineCap" />
<public type="attr" name="strokeLineJoin" />
<public type="attr" name="strokeMiterLimit" />
- <public type="attr" name="requiredForProfile"/>
- <public type="attr" name="colorControlNormal" />
+ <public type="attr" name="colorControlNormal" id="0x1010429"/>
<public type="attr" name="colorControlActivated" />
<public type="attr" name="colorButtonNormal" />
<public type="attr" name="colorControlHighlight" />
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index c68f355..2936e2b 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2112,9 +2112,9 @@
<string name="permdesc_use_sip">Allows the app to make and receive SIP calls.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
- <string name="permlab_bind_call_service">interact with in-call screen</string>
+ <string name="permlab_bind_incall_service">interact with in-call screen</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
- <string name="permdesc_bind_call_service">Allows the app to control when and how the user sees the in-call screen.</string>
+ <string name="permdesc_bind_incall_service">Allows the app to control when and how the user sees the in-call screen.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_bind_connection_service">interact with telephony services</string>
@@ -2122,6 +2122,11 @@
<string name="permdesc_bind_connection_service">Allows the app to interact with telephony services to make/receive calls.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permlab_control_incall_experience">provide an in-call user experience</string>
+ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permdesc_control_incall_experience">Allows the app to provide an in-call user experience.</string>
+
+ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_readNetworkUsageHistory">read historical network usage</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_readNetworkUsageHistory">Allows the app to read historical network usage for specific networks and apps.</string>
@@ -3899,10 +3904,10 @@
<!-- Description of an application permission that lets it control keyguard. -->
<string name="permdesc_recovery">Allows an application to interact with the recovery system and system updates.</string>
- <!-- Title of an application permission that lets it create media projection sessions. -->
- <string name="permlab_createMediaProjection">Create media projection sessions</string>
- <!-- Description of an application permission that lets it create media projection sessions. -->
- <string name="permdesc_createMediaProjection">Allows an application to create media projection sessions. These sessions can provide applications the ability to capture display and audio contents. Should never be needed by normal apps.</string>
+ <!-- Title of an application permission that lets it manage media projection sessions. -->
+ <string name="permlab_manageMediaProjection">Manage media projection sessions</string>
+ <!-- Description of an application permission that lets it manage media projection sessions. -->
+ <string name="permdesc_manageMediaProjection">Allows an application to manage media projection sessions. These sessions can provide applications the ability to capture display and audio contents. Should never be needed by normal apps.</string>
<!-- Title of an application permission that lets it read install sessions. -->
<string name="permlab_readInstallSessions">Read install sessions</string>
@@ -4245,15 +4250,15 @@
<string name="data_usage_warning_body">Touch to view usage and settings.</string>
<!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_3g_limit_title">2G-3G data is off</string>
+ <string name="data_usage_3g_limit_title">2G-3G data limit reached</string>
<!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_4g_limit_title">4G data is off</string>
+ <string name="data_usage_4g_limit_title">4G data limit reached</string>
<!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_mobile_limit_title">Cellular data is off</string>
+ <string name="data_usage_mobile_limit_title">Cellular data limit reached</string>
<!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_wifi_limit_title">Wi-Fi data is off</string>
+ <string name="data_usage_wifi_limit_title">Wi-Fi data limit reached</string>
<!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
- <string name="data_usage_limit_body">Limit reached</string>
+ <string name="data_usage_limit_body">Data paused for rest of cycle</string>
<!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
<string name="data_usage_3g_limit_snoozed_title">2G-3G data limit exceeded</string>
diff --git a/core/res/res/values/styles_leanback.xml b/core/res/res/values/styles_leanback.xml
index da83c36..7606c86 100644
--- a/core/res/res/values/styles_leanback.xml
+++ b/core/res/res/values/styles_leanback.xml
@@ -15,8 +15,7 @@
-->
<resources>
<style name="AlertDialog.Leanback" parent="AlertDialog.Material">
- <item name="layout">@android:layout/alert_dialog_leanback</item>
- <item name="buttonPanelSideLayout">@android:layout/alert_dialog_leanback_button_panel_right</item>
+ <item name="buttonPanelSideLayout">@android:layout/alert_dialog_leanback_button_panel_side</item>
</style>
<style name="AlertDialog.Leanback.Light">
@@ -24,7 +23,6 @@
<style name="Widget.Leanback.TimePicker" parent="Widget.Material.TimePicker">
<item name="timePickerMode">spinner</item>
- <item name="legacyLayout">@layout/time_picker_legacy_leanback</item>
</style>
<style name="Widget.Leanback.DatePicker" parent="Widget.Material.DatePicker">
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 0f27824..298fea3 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -877,6 +877,10 @@
<style name="Widget.Material.FastScroll" parent="Widget.FastScroll">
<item name="thumbMinWidth">0dp</item>
<item name="thumbMinHeight">0dp</item>
+ <item name="minWidth">88dp</item>
+ <item name="minHeight">88dp</item>
+ <item name="padding">0dp</item>
+ <item name="textSize">45sp</item>
</style>
<style name="Widget.Material.PreferenceFrameLayout">
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 426a82d..1cb7b17 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1982,4 +1982,5 @@
<java-symbol type="attr" name="checkMarkGravity" />
<java-symbol type="layout" name="select_dialog_singlechoice_material" />
<java-symbol type="layout" name="select_dialog_multichoice_material" />
+ <java-symbol type="array" name="no_ems_support_sim_operators" />
</resources>
diff --git a/core/res/res/values/themes_leanback.xml b/core/res/res/values/themes_leanback.xml
index 0a2c0a4..2b3b8d5 100644
--- a/core/res/res/values/themes_leanback.xml
+++ b/core/res/res/values/themes_leanback.xml
@@ -14,12 +14,33 @@
limitations under the License.
-->
<resources>
+ <style name="Theme.Leanback.Dialog" parent="Theme.Material.BaseDialog">
+ <item name="colorBackground">@color/background_leanback_dark</item>
+ <item name="textColorPrimary">@color/primary_text_leanback_dark</item>
+ <item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
+ <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
+ <item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>
+ <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>
+ <item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>
+ </style>
+
+ <style name="Theme.Leanback.Light.Dialog" parent="Theme.Material.Light.BaseDialog">
+ <item name="colorBackground">@color/background_leanback_dark</item>
+ <item name="textColorPrimary">@color/primary_text_leanback_dark</item>
+ <item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
+ <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
+ <item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>
+ <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>
+ <item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>
+ </style>
+
<style name="Theme.Leanback.Dialog.Alert" parent="Theme.Material.Dialog.BaseAlert">
<item name="colorBackground">@color/background_leanback_dark</item>
<item name="textColorPrimary">@color/primary_text_leanback_dark</item>
<item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
<item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
<item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>
+ <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>
<item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>
</style>
@@ -29,22 +50,13 @@
<item name="textColorSecondary">@color/secondary_text_leanback_light</item>
<item name="alertDialogStyle">@style/AlertDialog.Leanback.Light</item>
<item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>
+ <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>
<item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>
</style>
- <style name="Theme.Leanback.Light.Dialog" parent="Theme.Material.Light.Dialog">
- </style>
-
- <style name="Theme.Leanback.Dialog" parent="Theme.Material.Dialog">
- </style>
-
<style name="Theme.Leanback.Dialog.AppError" parent="Theme.Leanback.Dialog">
- <item name="windowFrame">@null</item>
- <item name="windowBackground">@color/transparent</item>
- <item name="windowIsFloating">true</item>
- <item name="windowContentOverlay">@null</item>
+ <item name="windowContentTransitions">false</item>
<item name="windowCloseOnTouchOutside">false</item>
- <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
</style>
<!-- Setup and form wizard themes @hide @SystemApi-->
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 691ddb1..18170ac 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -364,10 +364,10 @@
<!-- TODO: This belongs in a FastScroll style -->
<item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_material</item>
- <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_dark</item>
- <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_dark</item>
+ <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_material</item>
+ <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_material</item>
<item name="fastScrollTrackDrawable">@drawable/fastscroll_track_material</item>
- <item name="fastScrollOverlayPosition">atThumb</item>
+ <item name="fastScrollOverlayPosition">aboveThumb</item>
<!-- Color palette -->
<item name="colorPrimaryDark">@color/material_blue_grey_900</item>
@@ -706,10 +706,10 @@
<item name="datePickerDialogTheme">?attr/dialogTheme</item>
<item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_material</item>
- <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_light</item>
- <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_light</item>
+ <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_material</item>
+ <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_material</item>
<item name="fastScrollTrackDrawable">@drawable/fastscroll_track_material</item>
- <item name="fastScrollOverlayPosition">atThumb</item>
+ <item name="fastScrollOverlayPosition">aboveThumb</item>
<!-- Color palette -->
<item name="colorPrimaryDark">@color/material_blue_grey_100</item>
@@ -985,12 +985,7 @@
<!-- Dialog themes for Material -->
<eat-comment />
- <!-- Material theme for dialog windows and activities, which is used by the
- {@link android.app.Dialog} class. This changes the window to be
- floating (not fill the entire screen), and puts a frame around its
- contents. You can set this theme on an activity if you would like to
- make an activity that looks like a Dialog. -->
- <style name="Theme.Material.Dialog">
+ <style name="Theme.Material.BaseDialog">
<item name="windowFrame">@null</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Material</item>
<item name="windowBackground">@drawable/dialog_background_material</item>
@@ -1019,6 +1014,13 @@
<item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>
</style>
+ <!-- Material theme for dialog windows and activities, which is used by the
+ {@link android.app.Dialog} class. This changes the window to be
+ floating (not fill the entire screen), and puts a frame around its
+ contents. You can set this theme on an activity if you would like to
+ make an activity that looks like a Dialog. -->
+ <style name="Theme.Material.Dialog" parent="Theme.Material.BaseDialog"/>
+
<!-- Variant of Theme.Material.Dialog that has a nice minimum width for
a regular dialog. -->
<style name="Theme.Material.Dialog.MinWidth">
@@ -1095,12 +1097,7 @@
<!-- Light material dialog themes -->
- <!-- Material light theme for dialog windows and activities, which is used by the
- {@link android.app.Dialog} class. This changes the window to be
- floating (not fill the entire screen), and puts a frame around its
- contents. You can set this theme on an activity if you would like to
- make an activity that looks like a Dialog. -->
- <style name="Theme.Material.Light.Dialog">
+ <style name="Theme.Material.Light.BaseDialog">
<item name="windowFrame">@null</item>
<item name="windowTitleStyle">@style/DialogWindowTitle.Material.Light</item>
<item name="windowBackground">@drawable/dialog_background_material</item>
@@ -1129,6 +1126,13 @@
<item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>
</style>
+ <!-- Material light theme for dialog windows and activities, which is used by the
+ {@link android.app.Dialog} class. This changes the window to be
+ floating (not fill the entire screen), and puts a frame around its
+ contents. You can set this theme on an activity if you would like to
+ make an activity that looks like a Dialog. -->
+ <style name="Theme.Material.Light.Dialog" parent="Theme.Material.Light.BaseDialog"/>
+
<!-- Variant of Theme.Material.Light.Dialog that has a nice minimum width for
a regular dialog. -->
<style name="Theme.Material.Light.Dialog.MinWidth">
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java
index 116a31e..93b16e7 100644
--- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java
+++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java
@@ -26,8 +26,8 @@
import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings;
import android.net.LinkAddress;
-import android.net.LinkProperties;
import android.net.RouteInfo;
+import android.net.StaticIpConfiguration;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.AuthAlgorithm;
import android.net.wifi.WifiConfiguration.KeyMgmt;
@@ -116,7 +116,7 @@
boolean usercert = false;
WifiConfiguration config = null;
int securityType = NONE;
- LinkProperties mLinkProperties = null;
+ StaticIpConfiguration mStaticIpConfiguration = null;
InetAddress mInetAddr = null;
@Override
@@ -153,7 +153,7 @@
usercert = true;
}
if (tagName.equalsIgnoreCase("ip")) {
- mLinkProperties = new LinkProperties();
+ mStaticIpConfiguration = new StaticIpConfiguration();
ip = true;
}
if (tagName.equalsIgnoreCase("gateway")) {
@@ -173,15 +173,15 @@
@Override
public void endElement(String uri, String localName, String tagName) throws SAXException {
if (tagName.equalsIgnoreCase("accesspoint")) {
- if (mLinkProperties != null) {
+ if (mStaticIpConfiguration != null) {
config.setIpAssignment(IpAssignment.STATIC);
- config.setLinkProperties(mLinkProperties);
+ config.setStaticIpConfiguration(mStaticIpConfiguration);
} else {
config.setIpAssignment(IpAssignment.DHCP);
}
config.setProxySettings(ProxySettings.NONE);
networks.add(config);
- mLinkProperties = null;
+ mStaticIpConfiguration = null;
}
}
@@ -312,7 +312,7 @@
if (!InetAddress.isNumeric(gwAddr)) {
throw new SAXException();
}
- mLinkProperties.addRoute(new RouteInfo(InetAddress.getByName(gwAddr)));
+ mStaticIpConfiguration.gateway = InetAddress.getByName(gwAddr);
} catch (UnknownHostException e) {
throw new SAXException();
}
@@ -324,7 +324,7 @@
if ((nwPrefixLength < 0) || (nwPrefixLength > 32)) {
throw new SAXException();
}
- mLinkProperties.addLinkAddress(new LinkAddress(mInetAddr, nwPrefixLength));
+ mStaticIpConfiguration.ipAddress = new LinkAddress(mInetAddr, nwPrefixLength);
} catch (NumberFormatException e) {
throw new SAXException();
}
@@ -336,7 +336,7 @@
if (!InetAddress.isNumeric(dnsAddr)) {
throw new SAXException();
}
- mLinkProperties.addDnsServer(InetAddress.getByName(dnsAddr));
+ mStaticIpConfiguration.dnsServers.add(InetAddress.getByName(dnsAddr));
} catch (UnknownHostException e) {
throw new SAXException();
}
@@ -348,7 +348,7 @@
if (!InetAddress.isNumeric(dnsAddr)) {
throw new SAXException();
}
- mLinkProperties.addDnsServer(InetAddress.getByName(dnsAddr));
+ mStaticIpConfiguration.dnsServers.add(InetAddress.getByName(dnsAddr));
} catch (UnknownHostException e) {
throw new SAXException();
}
diff --git a/docs/html/google/play/billing/billing_reference.jd b/docs/html/google/play/billing/billing_reference.jd
index e168d70..4f5e65c 100644
--- a/docs/html/google/play/billing/billing_reference.jd
+++ b/docs/html/google/play/billing/billing_reference.jd
@@ -102,15 +102,28 @@
</tr>
<tr>
<td>{@code type}</td>
- <td>Value must be “inapp” for an in-app product or "subs" for
+ <td>Value must be “inapp” for an in-app product or "subs" for
subscriptions.</td>
</tr>
<tr>
<td>{@code price}</td>
- <td>Formatted price of the item, including its currency sign. The price
+ <td>Formatted price of the item, including its currency sign. The price
does not include tax.</td>
</tr>
<tr>
+ <td>{@code price_amount_micros}</td>
+ <td>Price in micro-units, where 1,000,000 micro-units equal one unit of the
+ currency. For example, if {@code price} is {@code "€7.99"}, {@code
+ price_amount_micros} is {@code "7990000"}.</td>
+ </tr>
+ <tr>
+ <td>{@code price_currency_code}</td>
+ <td><a href="http://en.wikipedia.org/wiki/ISO_4217#Active_codes">ISO 4217
+ currency code</a> for {@code price}. For example, if {@code price} is
+ specified in British pounds sterling, {@code price_currency_code} is {@code
+ "GBP"}.</td>
+ </tr>
+ <tr>
<td>{@code title}</td>
<td>Title of the product.</td>
</tr>
diff --git a/docs/html/guide/components/intents-common.jd b/docs/html/guide/components/intents-common.jd
index b4813a5..3b52b0a 100644
--- a/docs/html/guide/components/intents-common.jd
+++ b/docs/html/guide/components/intents-common.jd
@@ -1316,7 +1316,7 @@
<dt>{@link android.provider.MediaStore#EXTRA_MEDIA_FOCUS MediaStore.EXTRA_MEDIA_FOCUS} (required)</dt>
<dd>
<p>Indicates the search mode (whether the user is looking for a particular artist, album, song,
-playlist, or radio channel). Most search modes take additional extras. For example, if the user
+or playlist). Most search modes take additional extras. For example, if the user
is interested in listening to a particular song, the intent might have three additional extras:
the song title, the artist, and the album. This intent supports the following search modes for
each value of {@link android.provider.MediaStore#EXTRA_MEDIA_FOCUS}:</p>
@@ -1399,24 +1399,6 @@
intent as an unstructured search.</li>
</ul>
</dd>
-<dt><p><em>Radio channel</em> - <code>"vnd.android.cursor.item/radio"</code></p></dt>
-<dd>
-<p>Play a particular radio channel or a radio channel that matches some criteria specified
-by additional extras.</p>
-<p>Additional extras:</p>
-<ul>
- <li>{@link android.provider.MediaStore#EXTRA_MEDIA_ALBUM} - The album.</li>
- <li>{@link android.provider.MediaStore#EXTRA_MEDIA_ARTIST} - The artist.</li>
- <li><code>"android.intent.extra.genre"</code> - The genre.</li>
- <li><code>"android.intent.extra.radio_channel"</code> - The radio channel.</li>
- <li>{@link android.provider.MediaStore#EXTRA_MEDIA_TITLE} - The song name that the radio
- channel is based on.</li>
- <li>{@link android.app.SearchManager#QUERY} (required) - A string that contains any combination
- of: the album, the artist, the genre, the radio channel, or the title. This extra is
- always provided for backward compatibility: existing apps that do not know about search
- modes can process this intent as an unstructured search.</li>
-</ul>
-</dd>
<dt><p><em>Playlist</em> - {@link android.provider.MediaStore.Audio.Playlists#ENTRY_CONTENT_TYPE Audio.Playlists.ENTRY_CONTENT_TYPE}</p></dt>
<dd>
<p>Play a particular playlist or a playlist that matches some criteria specified
@@ -1444,13 +1426,13 @@
<p><b>Example intent:</b></p>
-<p>If the user wants to listen to a radio station that plays songs from a particular artist,
-a search app may generate the following intent:</p>
+<p>If the user wants to listen to music from a particular artist, a search app may generate the
+following intent:</p>
<pre>
-public void playSearchRadioByArtist(String artist) {
+public void playSearchArtist(String artist) {
Intent intent = new Intent(MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH);
intent.putExtra(MediaStore.EXTRA_MEDIA_FOCUS,
- "vnd.android.cursor.item/radio");
+ MediaStore.Audio.Artists.ENTRY_CONTENT_TYPE);
intent.putExtra(MediaStore.EXTRA_MEDIA_ARTIST, artist);
intent.putExtra(SearchManager.QUERY, artist);
if (intent.resolveActivity(getPackageManager()) != null) {
@@ -1488,7 +1470,6 @@
String artist = intent.getStringExtra(MediaStore.EXTRA_MEDIA_ARTIST);
String genre = intent.getStringExtra("android.intent.extra.genre");
String playlist = intent.getStringExtra("android.intent.extra.playlist");
- String rchannel = intent.getStringExtra("android.intent.extra.radio_channel");
String title = intent.getStringExtra(MediaStore.EXTRA_MEDIA_TITLE);
// Determine the search mode and use the corresponding extras
@@ -1521,10 +1502,6 @@
// 'Song' search mode
playSong(album, artist, genre, title);
- } else if (mediaFocus.compareTo("vnd.android.cursor.item/radio") == 0) {
- // 'Radio channel' search mode
- playRadioChannel(album, artist, genre, rchannel, title);
-
} else if (mediaFocus.compareTo(MediaStore.Audio.Playlists.ENTRY_CONTENT_TYPE) == 0) {
// 'Playlist' search mode
playPlaylist(album, artist, genre, playlist, title);
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index e7f93bc..71d6c1c 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -251,36 +251,36 @@
<td>Windows</td>
<td>
<a onclick="return onDownload(this)" id="win-studio"
- href="http://dl.google.com/android/studio/install/0.8.0/android-studio-bundle-135.1245622-windows.exe">
- android-studio-bundle-135.1245622-windows.exe
+ href="http://dl.google.com/android/studio/install/0.8.6/android-studio-bundle-135.1339820-windows.exe">
+ android-studio-bundle-135.1339820-windows.exe
</a>
</td>
- <td>380000036 bytes</td>
- <td>5720baef7d492f2df7398a38dae2fa92</td>
+ <td>379497130 bytes</td>
+ <td>024e002b8c8fa7dcd2ff69fd69e06e56</td>
</tr>
<tr>
<td><nobr>Mac OS X</nobr></td>
<td>
<a onclick="return onDownload(this)" id="mac-studio"
- href="http://dl.google.com/android/studio/install/0.8.0/android-studio-bundle-135.1245622-mac.dmg">
- android-studio-bundle-135.1245622-mac.dmg
+ href="http://dl.google.com/android/studio/install/0.8.6/android-studio-bundle-135.1339820-mac.dmg">
+ android-studio-bundle-135.1339820-mac.dmg
</a>
</td>
- <td>368451923 bytes</td>
- <td>fa9da3625db44687576c5c4e8f96280e</td>
+ <td>368507143 bytes</td>
+ <td>4143f2aa556634eae91701965d88899b</td>
</tr>
<tr>
<td>Linux</td>
<td>
<a onclick="return onDownload(this)" id="linux-studio"
- href="http://dl.google.com/android/studio/install/0.8.0/android-studio-bundle-135.1245622-linux.tgz">
- android-studio-bundle-135.1245622-linux.tgz
+ href="http://dl.google.com/android/studio/install/0.8.6/android-studio-bundle-135.1339820-linux.tgz">
+ android-studio-bundle-135.1339820-linux.tgz
</a>
</td>
- <td>417756987 bytes</td>
- <td>c70dd2e4035484b84f0ad0046a34f136</td>
+ <td>417631443 bytes</td>
+ <td>fa403762ecd0a5da87acbeff485f81cc</td>
</tr>
</table>
@@ -450,6 +450,17 @@
<div class="toggle-content opened">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
+ alt=""/>Android Studio v0.8.6</a> <em>(August 2014)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+ <p>See <a href="http://tools.android.com/recent">tools.android.com</a> for a full list of changes.</p>
+ </div>
+</div>
+
+<div class="toggle-content closed">
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
alt=""/>Android Studio v0.8.0</a> <em>(June 2014)</em>
</p>
@@ -636,7 +647,7 @@
if (os) {
/* set up primary ACE download button */
$('#download-ide-button').show();
- $('#download-ide-button').append("Download Android Studio Beta <span class='small'>v0.8.0</span>"
+ $('#download-ide-button').append("Download Android Studio Beta <span class='small'>v0.8.6</span>"
+ "<br/> <span class='small'>with the Android SDK for " + os + "</span>");
$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);
diff --git a/graphics/java/android/graphics/Outline.java b/graphics/java/android/graphics/Outline.java
index 3177023..4bf0b71 100644
--- a/graphics/java/android/graphics/Outline.java
+++ b/graphics/java/android/graphics/Outline.java
@@ -18,15 +18,15 @@
import android.annotation.NonNull;
import android.graphics.drawable.Drawable;
-import android.view.View;
/**
* Defines a simple shape, used for bounding graphical regions.
* <p>
- * Can be used with a View, or computed by a Drawable, to drive the shape of shadows cast by a
- * View, or to clip the contents of the View.
+ * Can be computed for a View, or computed by a Drawable, to drive the shape of
+ * shadows cast by a View, or to clip the contents of the View.
*
- * @see View#setOutline(Outline)
+ * @see android.view.ViewOutlineProvider
+ * @see android.view.View#setOutlineProvider(android.view.ViewOutlineProvider)
* @see Drawable#getOutline(Outline)
*/
public final class Outline {
@@ -79,21 +79,27 @@
/**
* Returns whether the outline can be used to clip a View.
+ * <p>
+ * Currently, only Outlines that can be represented as a rectangle, circle,
+ * or round rect support clipping.
*
- * Currently, only outlines that can be represented as a rectangle, circle, or round rect
- * support clipping.
- *
- * @see {@link View#setClipToOutline(boolean)}
+ * @see {@link android.view.View#setClipToOutline(boolean)}
*/
public boolean canClip() {
return !isEmpty() && mRect != null;
}
/**
- * Sets the alpha represented by the Outline.
- *
- * Content producing a fully opaque (alpha = 1.0f) outline is assumed by the drawing system
- * to fully cover content beneath it, meaning content beneath may be optimized away.
+ * Sets the alpha represented by the Outline - the degree to which the
+ * producer is guaranteed to be opaque over the Outline's shape.
+ * <p>
+ * An alpha value of <code>0.0f</code> either represents completely
+ * transparent content, or content that isn't guaranteed to fill the shape
+ * it publishes.
+ * <p>
+ * Content producing a fully opaque (alpha = <code>1.0f</code>) outline is
+ * assumed by the drawing system to fully cover content beneath it,
+ * meaning content beneath may be optimized away.
*/
public void setAlpha(float alpha) {
mAlpha = alpha;
@@ -130,7 +136,8 @@
}
/**
- * Sets the Outline to the rounded rect defined by the input rect, and corner radius.
+ * Sets the Outline to the rounded rect defined by the input rect, and
+ * corner radius.
*/
public void setRect(int left, int top, int right, int bottom) {
setRoundRect(left, top, right, bottom, 0.0f);
@@ -145,7 +152,7 @@
/**
* Sets the Outline to the rounded rect defined by the input rect, and corner radius.
- *
+ * <p>
* Passing a zero radius is equivalent to calling {@link #setRect(int, int, int, int)}
*/
public void setRoundRect(int left, int top, int right, int bottom, float radius) {
@@ -196,7 +203,8 @@
}
/**
- * Sets the Constructs an Outline from a {@link android.graphics.Path#isConvex() convex path}.
+ * Sets the Constructs an Outline from a
+ * {@link android.graphics.Path#isConvex() convex path}.
*/
public void setConvexPath(@NonNull Path convexPath) {
if (convexPath.isEmpty()) {
diff --git a/graphics/java/android/graphics/drawable/AnimationDrawable.java b/graphics/java/android/graphics/drawable/AnimationDrawable.java
index 5318fa7..d87e8e4 100644
--- a/graphics/java/android/graphics/drawable/AnimationDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java
@@ -114,7 +114,9 @@
final boolean changed = super.setVisible(visible, restart);
if (visible) {
if (restart || changed) {
- setFrame(restart ? 0 : mCurFrame, true, mAnimating);
+ boolean startFromZero = restart || mCurFrame < 0 ||
+ mCurFrame >= mAnimationState.getChildCount();
+ setFrame(startFromZero ? 0 : mCurFrame, true, mAnimating);
}
} else {
unscheduleSelf(this);
diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java
index 40adf94..e52d778 100644
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -602,9 +602,9 @@
@Override
public void getOutline(@NonNull Outline outline) {
super.getOutline(outline);
- if (mBitmapState.mBitmap.hasAlpha()) {
- // Bitmaps with alpha can't report a non-0 alpha,
- // since they may not fill their rectangular bounds
+ if (mBitmapState.mBitmap == null || mBitmapState.mBitmap.hasAlpha()) {
+ // Only opaque Bitmaps can report a non-0 alpha,
+ // since only they are guaranteed to fill their bounds
outline.setAlpha(0.0f);
}
}
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index a383aab..29b9141 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -820,7 +820,7 @@
@Override
public int getOpacity() {
- return (mAlpha == 255 && mGradientState.mOpaque) ?
+ return (mAlpha == 255 && mGradientState.mOpaqueOverBounds) ?
PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT;
}
@@ -1413,7 +1413,8 @@
public void getOutline(Outline outline) {
final GradientState st = mGradientState;
final Rect bounds = getBounds();
- outline.setAlpha(mAlpha / 255.0f);
+ // only report non-zero alpha if shape being drawn is opaque
+ outline.setAlpha(st.mOpaqueOverShape ? (mAlpha / 255.0f) : 0.0f);
switch (st.mShape) {
case RECTANGLE:
@@ -1492,7 +1493,8 @@
private int mGradientRadiusType = RADIUS_TYPE_PIXELS;
private boolean mUseLevel;
private boolean mUseLevelForShape;
- private boolean mOpaque;
+ private boolean mOpaqueOverBounds;
+ private boolean mOpaqueOverShape;
int[] mThemeAttrs;
int[] mAttrSize;
@@ -1544,7 +1546,7 @@
mGradientRadiusType = state.mGradientRadiusType;
mUseLevel = state.mUseLevel;
mUseLevelForShape = state.mUseLevelForShape;
- mOpaque = state.mOpaque;
+ mOpaqueOverBounds = state.mOpaqueOverBounds;
mThemeAttrs = state.mThemeAttrs;
mAttrSize = state.mAttrSize;
mAttrGradient = state.mAttrGradient;
@@ -1606,40 +1608,36 @@
}
private void computeOpacity() {
- if (mShape != RECTANGLE) {
- mOpaque = false;
- return;
- }
+ mOpaqueOverBounds = false;
+ mOpaqueOverShape = false;
- if (mRadius > 0 || mRadiusArray != null) {
- mOpaque = false;
- return;
- }
-
+ // First test opacity of all colors
if (mStrokeWidth > 0) {
if (mStrokeColorStateList != null) {
if (!mStrokeColorStateList.isOpaque()) {
- mOpaque = false;
return;
}
}
}
if (mColorStateList != null && !mColorStateList.isOpaque()) {
- mOpaque = false;
return;
}
if (mColors != null) {
for (int i = 0; i < mColors.length; i++) {
if (!isOpaque(mColors[i])) {
- mOpaque = false;
return;
}
}
}
- mOpaque = true;
+ // Colors are opaque, so opaqueOverShape=true,
+ mOpaqueOverShape = true;
+ // and opaqueOverBounds=true if shape fills bounds
+ mOpaqueOverBounds = mShape == RECTANGLE
+ && mRadius <= 0
+ && mRadiusArray == null;
}
private static boolean isOpaque(int color) {
diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java
index 588e776..dd0f06f 100644
--- a/graphics/java/android/graphics/drawable/InsetDrawable.java
+++ b/graphics/java/android/graphics/drawable/InsetDrawable.java
@@ -26,10 +26,13 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.Resources.Theme;
-import android.graphics.*;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Insets;
+import android.graphics.Outline;
import android.graphics.PorterDuff.Mode;
+import android.graphics.Rect;
import android.util.AttributeSet;
-import android.util.Log;
import java.io.IOException;
@@ -50,8 +53,6 @@
* @attr ref android.R.styleable#InsetDrawable_insetBottom
*/
public class InsetDrawable extends Drawable implements Drawable.Callback {
- private static final String LOG_TAG = "InsetDrawable";
-
private final Rect mTmpRect = new Rect();
private InsetState mInsetState;
@@ -86,7 +87,6 @@
final TypedArray a = r.obtainAttributes(attrs, R.styleable.InsetDrawable);
super.inflateWithAttributes(r, parser, a, R.styleable.InsetDrawable_visible);
updateStateFromTypedArray(a);
- a.recycle();
// Load inner XML elements.
if (mInsetState.mDrawable == null) {
@@ -104,9 +104,17 @@
dr.setCallback(this);
}
- // Verify state.
- if (mInsetState.mDrawable == null) {
- Log.w(LOG_TAG, "No drawable specified for <inset>");
+ verifyRequiredAttributes(a);
+ a.recycle();
+ }
+
+ private void verifyRequiredAttributes(TypedArray a) throws XmlPullParserException {
+ // If we're not waiting on a theme, verify required attributes.
+ if (mInsetState.mDrawable == null && (mInsetState.mThemeAttrs == null
+ || mInsetState.mThemeAttrs[R.styleable.InsetDrawable_drawable] == 0)) {
+ throw new XmlPullParserException(a.getPositionDescription() +
+ ": <inset> tag requires a 'drawable' attribute or "
+ + "child tag defining a drawable");
}
}
@@ -167,6 +175,7 @@
final TypedArray a = t.resolveAttributes(state.mThemeAttrs, R.styleable.InsetDrawable);
try {
updateStateFromTypedArray(a);
+ verifyRequiredAttributes(a);
} catch (XmlPullParserException e) {
throw new RuntimeException(e);
} finally {
@@ -224,12 +233,8 @@
padding.top += mInsetState.mInsetTop;
padding.bottom += mInsetState.mInsetBottom;
- if (pad || (mInsetState.mInsetLeft | mInsetState.mInsetRight |
- mInsetState.mInsetTop | mInsetState.mInsetBottom) != 0) {
- return true;
- } else {
- return false;
- }
+ return pad || (mInsetState.mInsetLeft | mInsetState.mInsetRight |
+ mInsetState.mInsetTop | mInsetState.mInsetBottom) != 0;
}
/** @hide */
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h
index c6d3db7..1032a75 100644
--- a/libs/hwui/DisplayListOp.h
+++ b/libs/hwui/DisplayListOp.h
@@ -208,6 +208,8 @@
// ensure that local bounds cover mapped bounds
if (!state.mMatrix.isSimple()) return false;
+ if (state.mRoundRectClipState) return false;
+
// check state/paint for transparency
if (mPaint) {
if (mPaint->getShader() && !mPaint->getShader()->isOpaque()) {
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 6a76a71..e69c456 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -2332,18 +2332,21 @@
}
/**
- * Registers a {@link RemoteController} instance for it to receive media metadata updates
- * and playback state information from applications using {@link RemoteControlClient}, and
- * control their playback.
- * <p>Registration requires the {@link OnClientUpdateListener} listener to be one of the
- * enabled notification listeners (see
+ * Registers a {@link RemoteController} instance for it to receive media
+ * metadata updates and playback state information from applications using
+ * {@link RemoteControlClient}, and control their playback.
+ * <p>
+ * Registration requires the {@link OnClientUpdateListener} listener to be
+ * one of the enabled notification listeners (see
* {@link android.service.notification.NotificationListenerService}).
+ *
* @param rctlr the object to register.
- * @return true if the {@link RemoteController} was successfully registered, false if an
- * error occurred, due to an internal system error, or insufficient permissions.
+ * @return true if the {@link RemoteController} was successfully registered,
+ * false if an error occurred, due to an internal system error, or
+ * insufficient permissions.
* @deprecated Use
- * {@link MediaSessionManager#addActiveSessionsListener(android.media.session.MediaSessionManager.SessionListener, ComponentName)}
- * and {@link MediaController} instead.
+ * {@link MediaSessionManager#addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, ComponentName)}
+ * and {@link MediaController} instead.
*/
@Deprecated
public boolean registerRemoteController(RemoteController rctlr) {
@@ -2355,12 +2358,14 @@
}
/**
- * Unregisters a {@link RemoteController}, causing it to no longer receive media metadata and
- * playback state information, and no longer be capable of controlling playback.
+ * Unregisters a {@link RemoteController}, causing it to no longer receive
+ * media metadata and playback state information, and no longer be capable
+ * of controlling playback.
+ *
* @param rctlr the object to unregister.
* @deprecated Use
- * {@link MediaSessionManager#removeActiveSessionsListener(android.media.session.MediaSessionManager.SessionListener)}
- * instead.
+ * {@link MediaSessionManager#removeOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener)}
+ * instead.
*/
@Deprecated
public void unregisterRemoteController(RemoteController rctlr) {
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 52bcbbb..1861bd7 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -92,7 +92,7 @@
/** Minimum value for sample rate */
private static final int SAMPLE_RATE_HZ_MIN = 4000;
/** Maximum value for sample rate */
- private static final int SAMPLE_RATE_HZ_MAX = 48000;
+ private static final int SAMPLE_RATE_HZ_MAX = 96000;
/** Maximum value for AudioTrack channel count */
private static final int CHANNEL_COUNT_MAX = 8;
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 2fa0c93..7c3b4fc 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -1049,8 +1049,17 @@
private void setDataSource(String path, String[] keys, String[] values)
throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
final Uri uri = Uri.parse(path);
- if ("file".equals(uri.getScheme())) {
+ final String scheme = uri.getScheme();
+ if ("file".equals(scheme)) {
path = uri.getPath();
+ } else if (scheme != null) {
+ // handle non-file sources
+ nativeSetDataSource(
+ MediaHTTPService.createHttpServiceBinderIfNecessary(path),
+ path,
+ keys,
+ values);
+ return;
}
final File file = new File(path);
@@ -1060,20 +1069,10 @@
setDataSource(fd);
is.close();
} else {
- _setDataSource(path, keys, values);
+ throw new IOException("setDataSource failed.");
}
}
- private void _setDataSource(
- String path, String[] keys, String[] values)
- throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
- nativeSetDataSource(
- MediaHTTPService.createHttpServiceBinderIfNecessary(path),
- path,
- keys,
- values);
- }
-
private native void nativeSetDataSource(
IBinder httpServiceBinder, String path, String[] keys, String[] values)
throws IOException, IllegalArgumentException, SecurityException, IllegalStateException;
diff --git a/media/java/android/media/RemoteController.java b/media/java/android/media/RemoteController.java
index adc8391..f378cef 100644
--- a/media/java/android/media/RemoteController.java
+++ b/media/java/android/media/RemoteController.java
@@ -74,7 +74,7 @@
private MetadataEditor mMetadataEditor;
private MediaSessionManager mSessionManager;
- private MediaSessionManager.SessionListener mSessionListener;
+ private MediaSessionManager.OnActiveSessionsChangedListener mSessionListener;
private MediaController.Callback mSessionCb = new MediaControllerCallback();
/**
@@ -140,7 +140,7 @@
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
mSessionManager = (MediaSessionManager) context
.getSystemService(Context.MEDIA_SESSION_SERVICE);
- mSessionListener = new TopTransportSessionListener(context);
+ mSessionListener = new TopTransportSessionListener();
if (ActivityManager.isLowRamDeviceStatic()) {
mMaxBitmapDimension = MAX_BITMAP_DIMENSION;
@@ -710,11 +710,8 @@
* Listens for changes to the active session stack and replaces the
* currently tracked session if it has changed.
*/
- private class TopTransportSessionListener extends MediaSessionManager.SessionListener {
-
- public TopTransportSessionListener(Context context) {
- super(context);
- }
+ private class TopTransportSessionListener implements
+ MediaSessionManager.OnActiveSessionsChangedListener {
@Override
public void onActiveSessionsChanged(List<MediaController> controllers) {
@@ -792,7 +789,7 @@
void startListeningToSessions() {
final ComponentName listenerComponent = new ComponentName(mContext,
mOnClientUpdateListener.getClass());
- mSessionManager.addActiveSessionsListener(mSessionListener, listenerComponent,
+ mSessionManager.addOnActiveSessionsChangedListener(mSessionListener, listenerComponent,
UserHandle.myUserId(), null);
mSessionListener.onActiveSessionsChanged(mSessionManager
.getActiveSessions(listenerComponent));
@@ -806,7 +803,7 @@
* @hide
*/
void stopListeningToSessions() {
- mSessionManager.removeActiveSessionsListener(mSessionListener);
+ mSessionManager.removeOnActiveSessionsChangedListener(mSessionListener);
if (DEBUG) {
Log.d(TAG, "Unregistered session listener for user "
+ UserHandle.myUserId());
diff --git a/media/java/android/media/projection/IMediaProjectionManager.aidl b/media/java/android/media/projection/IMediaProjectionManager.aidl
index 6ed803a..7e10c51 100644
--- a/media/java/android/media/projection/IMediaProjectionManager.aidl
+++ b/media/java/android/media/projection/IMediaProjectionManager.aidl
@@ -17,6 +17,9 @@
package android.media.projection;
import android.media.projection.IMediaProjection;
+import android.media.projection.IMediaProjectionCallback;
+import android.media.projection.IMediaProjectionWatcherCallback;
+import android.media.projection.MediaProjectionInfo;
import android.os.IBinder;
/** {@hide} */
@@ -25,4 +28,8 @@
IMediaProjection createProjection(int uid, String packageName, int type,
boolean permanentGrant);
boolean isValidMediaProjection(IMediaProjection projection);
+ MediaProjectionInfo getActiveProjectionInfo();
+ void stopActiveProjection();
+ void addCallback(IMediaProjectionWatcherCallback callback);
+ void removeCallback(IMediaProjectionWatcherCallback callback);
}
diff --git a/media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl b/media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl
new file mode 100644
index 0000000..2231ce1
--- /dev/null
+++ b/media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.media.projection;
+
+import android.media.projection.MediaProjectionInfo;
+
+/** {@hide} */
+oneway interface IMediaProjectionWatcherCallback {
+ void onStart(in MediaProjectionInfo info);
+ void onStop(in MediaProjectionInfo info);
+}
diff --git a/media/java/android/media/projection/MediaProjectionInfo.aidl b/media/java/android/media/projection/MediaProjectionInfo.aidl
new file mode 100644
index 0000000..3c8f9b6
--- /dev/null
+++ b/media/java/android/media/projection/MediaProjectionInfo.aidl
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2014, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.media.projection;
+
+parcelable MediaProjectionInfo;
diff --git a/media/java/android/media/projection/MediaProjectionInfo.java b/media/java/android/media/projection/MediaProjectionInfo.java
new file mode 100644
index 0000000..7ebc31f
--- /dev/null
+++ b/media/java/android/media/projection/MediaProjectionInfo.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.media.projection;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.UserHandle;
+
+/** @hide */
+public final class MediaProjectionInfo implements Parcelable {
+ private final String mPackageName;
+ private final UserHandle mUserHandle;
+
+ public MediaProjectionInfo(String packageName, UserHandle handle) {
+ mPackageName = packageName;
+ mUserHandle = handle;
+ }
+
+ public MediaProjectionInfo(Parcel in) {
+ mPackageName = in.readString();
+ mUserHandle = UserHandle.readFromParcel(in);
+ }
+
+ public String getPackageName() {
+ return mPackageName;
+ }
+
+ public UserHandle getUserHandle() {
+ return mUserHandle;
+ }
+
+ @Override
+ public String toString() {
+ return "MediaProjectionInfo{mPackageName="
+ + mPackageName + ", mUserHandle="
+ + mUserHandle + "}";
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ out.writeString(mPackageName);
+ UserHandle.writeToParcel(mUserHandle, out);
+ }
+
+ public static final Parcelable.Creator<MediaProjectionInfo> CREATOR =
+ new Parcelable.Creator<MediaProjectionInfo>() {
+ @Override
+ public MediaProjectionInfo createFromParcel(Parcel in) {
+ return new MediaProjectionInfo (in);
+ }
+
+ @Override
+ public MediaProjectionInfo[] newArray(int size) {
+ return new MediaProjectionInfo[size];
+ }
+ };
+}
diff --git a/media/java/android/media/projection/MediaProjectionManager.java b/media/java/android/media/projection/MediaProjectionManager.java
index aac8cf9..50d66c6 100644
--- a/media/java/android/media/projection/MediaProjectionManager.java
+++ b/media/java/android/media/projection/MediaProjectionManager.java
@@ -17,12 +17,20 @@
package android.media.projection;
import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.media.projection.IMediaProjection;
import android.os.Binder;
+import android.os.Handler;
import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import java.util.Map;
/**
* Manages the retrieval of certain types of {@link MediaProjection} tokens.
@@ -35,6 +43,7 @@
* </p>
*/
public final class MediaProjectionManager {
+ private static final String TAG = "MediaProjectionManager";
/** @hide */
public static final String EXTRA_APP_TOKEN = "android.media.projection.extra.EXTRA_APP_TOKEN";
/** @hide */
@@ -49,10 +58,15 @@
public static final int TYPE_PRESENTATION = 2;
private Context mContext;
+ private Map<Callback, CallbackDelegate> mCallbacks;
+ private IMediaProjectionManager mService;
/** @hide */
public MediaProjectionManager(Context context) {
mContext = context;
+ IBinder b = ServiceManager.getService(Context.MEDIA_PROJECTION_SERVICE);
+ mService = IMediaProjectionManager.Stub.asInterface(b);
+ mCallbacks = new ArrayMap<>();
}
/**
@@ -88,4 +102,105 @@
}
return new MediaProjection(mContext, IMediaProjection.Stub.asInterface(projection));
}
+
+ /**
+ * Get the {@link MediaProjectionInfo} for the active {@link MediaProjection}.
+ * @hide
+ */
+ public MediaProjectionInfo getActiveProjectionInfo() {
+ try {
+ return mService.getActiveProjectionInfo();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to get the active projection info", e);
+ }
+ return null;
+ }
+
+ /**
+ * Stop the current projection if there is one.
+ * @hide
+ */
+ public void stopActiveProjection() {
+ try {
+ mService.stopActiveProjection();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to stop the currently active media projection", e);
+ }
+ }
+
+ /**
+ * Add a callback to monitor all of the {@link MediaProjection}s activity.
+ * Not for use by regular applications, must have the MANAGE_MEDIA_PROJECTION permission.
+ * @hide
+ */
+ public void addCallback(@NonNull Callback callback, @Nullable Handler handler) {
+ if (callback == null) {
+ throw new IllegalArgumentException("callback must not be null");
+ }
+ CallbackDelegate delegate = new CallbackDelegate(callback, handler);
+ mCallbacks.put(callback, delegate);
+ try {
+ mService.addCallback(delegate);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to add callbacks to MediaProjection service", e);
+ }
+ }
+
+ /**
+ * Remove a MediaProjection monitoring callback.
+ * @hide
+ */
+ public void removeCallback(@NonNull Callback callback) {
+ if (callback == null) {
+ throw new IllegalArgumentException("callback must not be null");
+ }
+ CallbackDelegate delegate = mCallbacks.remove(callback);
+ try {
+ if (delegate != null) {
+ mService.removeCallback(delegate);
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to add callbacks to MediaProjection service", e);
+ }
+ }
+
+ /** @hide */
+ public static abstract class Callback {
+ public abstract void onStart(MediaProjectionInfo info);
+ public abstract void onStop(MediaProjectionInfo info);
+ }
+
+ /** @hide */
+ private final static class CallbackDelegate extends IMediaProjectionWatcherCallback.Stub {
+ private Callback mCallback;
+ private Handler mHandler;
+
+ public CallbackDelegate(Callback callback, Handler handler) {
+ mCallback = callback;
+ if (handler == null) {
+ handler = new Handler();
+ }
+ mHandler = handler;
+ }
+
+ @Override
+ public void onStart(final MediaProjectionInfo info) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mCallback.onStart(info);
+ }
+ });
+ }
+
+ @Override
+ public void onStop(final MediaProjectionInfo info) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mCallback.onStop(info);
+ }
+ });
+ }
+ }
}
diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java
index 63c85f8..074e5ad 100644
--- a/media/java/android/media/session/MediaController.java
+++ b/media/java/android/media/session/MediaController.java
@@ -185,7 +185,7 @@
*
* @return The current play queue or null.
*/
- public @Nullable List<MediaSession.Track> getQueue() {
+ public @Nullable List<MediaSession.Item> getQueue() {
try {
ParceledListSlice queue = mSessionBinder.getQueue();
if (queue != null) {
@@ -259,18 +259,18 @@
}
/**
- * Get the current volume info for this session.
+ * Get the current audio info for this session.
*
- * @return The current volume info or null.
+ * @return The current audio info or null.
*/
- public @Nullable VolumeInfo getVolumeInfo() {
+ public @Nullable AudioInfo getAudioInfo() {
try {
ParcelableVolumeInfo result = mSessionBinder.getVolumeAttributes();
- return new VolumeInfo(result.volumeType, result.audioAttrs, result.controlType,
+ return new AudioInfo(result.volumeType, result.audioAttrs, result.controlType,
result.maxVolume, result.currentVolume);
} catch (RemoteException e) {
- Log.wtf(TAG, "Error calling getVolumeInfo.", e);
+ Log.wtf(TAG, "Error calling getAudioInfo.", e);
}
return null;
}
@@ -305,7 +305,7 @@
* {@link VolumeProvider#VOLUME_CONTROL_ABSOLUTE}. The flags in
* {@link AudioManager} may be used to affect the handling.
*
- * @see #getVolumeInfo()
+ * @see #getAudioInfo()
* @param value The value to set it to, between 0 and the reported max.
* @param flags Any flags to pass with the command.
*/
@@ -326,7 +326,7 @@
* {@link VolumeProvider#VOLUME_CONTROL_ABSOLUTE}. The flags in
* {@link AudioManager} may be used to affect the handling.
*
- * @see #getVolumeInfo()
+ * @see #getAudioInfo()
* @param direction The direction to adjust the volume in.
* @param flags Any flags to pass with the command.
*/
@@ -544,13 +544,14 @@
}
/**
- * Override to handle changes to tracks in the queue.
+ * Override to handle changes to items in the queue.
*
- * @param queue A list of tracks in the current play queue. It should include the currently
- * playing track as well as previous and upcoming tracks if applicable.
- * @see MediaSession.Track
+ * @param queue A list of items in the current play queue. It should
+ * include the currently playing item as well as previous and
+ * upcoming items if applicable.
+ * @see MediaSession.Item
*/
- public void onQueueChanged(@Nullable List<MediaSession.Track> queue) {
+ public void onQueueChanged(@Nullable List<MediaSession.Item> queue) {
}
/**
@@ -572,11 +573,11 @@
}
/**
- * Override to handle changes to the volume info.
+ * Override to handle changes to the audio info.
*
- * @param info The current volume info for this session.
+ * @param info The current audio info for this session.
*/
- public void onVolumeInfoChanged(VolumeInfo info) {
+ public void onAudioInfoChanged(AudioInfo info) {
}
}
@@ -638,14 +639,14 @@
}
/**
- * Play a track with a specific id in the play queue.
- * If you specify an id that is not in the play queue, the behavior is undefined.
+ * Play an item with a specific id in the play queue. If you specify an
+ * id that is not in the play queue, the behavior is undefined.
*/
- public void skipToTrack(long id) {
+ public void skipToItem(long id) {
try {
mSessionBinder.skipToTrack(id);
} catch (RemoteException e) {
- Log.wtf(TAG, "Error calling skipToTrack(" + id + ").", e);
+ Log.wtf(TAG, "Error calling skipToItem(" + id + ").", e);
}
}
@@ -784,9 +785,9 @@
}
/**
- * Holds information about the way volume is handled for this session.
+ * Holds information about the way audio is handled for this session.
*/
- public static final class VolumeInfo {
+ public static final class AudioInfo {
private final int mVolumeType;
private final int mVolumeControl;
private final int mMaxVolume;
@@ -796,7 +797,7 @@
/**
* @hide
*/
- public VolumeInfo(int type, AudioAttributes attrs, int control, int max, int current) {
+ public AudioInfo(int type, AudioAttributes attrs, int control, int max, int current) {
mVolumeType = type;
mAudioAttrs = attrs;
mVolumeControl = control;
@@ -904,7 +905,7 @@
@Override
public void onQueueChanged(ParceledListSlice parceledQueue) {
- List<MediaSession.Track> queue = parceledQueue.getList();
+ List<MediaSession.Item> queue = parceledQueue.getList();
MediaController controller = mController.get();
if (controller != null) {
controller.postMessage(MSG_UPDATE_QUEUE, queue, null);
@@ -931,7 +932,7 @@
public void onVolumeInfoChanged(ParcelableVolumeInfo pvi) {
MediaController controller = mController.get();
if (controller != null) {
- VolumeInfo info = new VolumeInfo(pvi.volumeType, pvi.audioAttrs, pvi.controlType,
+ AudioInfo info = new AudioInfo(pvi.volumeType, pvi.audioAttrs, pvi.controlType,
pvi.maxVolume, pvi.currentVolume);
controller.postMessage(MSG_UPDATE_VOLUME, info, null);
}
@@ -960,7 +961,7 @@
mCallback.onMetadataChanged((MediaMetadata) msg.obj);
break;
case MSG_UPDATE_QUEUE:
- mCallback.onQueueChanged((List<MediaSession.Track>) msg.obj);
+ mCallback.onQueueChanged((List<MediaSession.Item>) msg.obj);
break;
case MSG_UPDATE_QUEUE_TITLE:
mCallback.onQueueTitleChanged((CharSequence) msg.obj);
@@ -969,7 +970,7 @@
mCallback.onExtrasChanged((Bundle) msg.obj);
break;
case MSG_UPDATE_VOLUME:
- mCallback.onVolumeInfoChanged((VolumeInfo) msg.obj);
+ mCallback.onAudioInfoChanged((AudioInfo) msg.obj);
break;
case MSG_DESTROYED:
mCallback.onSessionDestroyed();
diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index cf73c2a..2cd161c 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -435,18 +435,19 @@
}
/**
- * Update the list of tracks in the play queue. It is an ordered list and should contain the
- * current track, and previous or upcoming tracks if they exist.
- * Specify null if there is no current play queue.
+ * Update the list of items in the play queue. It is an ordered list and
+ * should contain the current item, and previous or upcoming items if they
+ * exist. Specify null if there is no current play queue.
* <p>
- * The queue should be of reasonable size. If the play queue is unbounded within your
- * app, it is better to send a reasonable amount in a sliding window instead.
+ * The queue should be of reasonable size. If the play queue is unbounded
+ * within your app, it is better to send a reasonable amount in a sliding
+ * window instead.
*
- * @param queue A list of tracks in the play queue.
+ * @param queue A list of items in the play queue.
*/
- public void setQueue(@Nullable List<Track> queue) {
+ public void setQueue(@Nullable List<Item> queue) {
try {
- mBinder.setQueue(new ParceledListSlice<Track>(queue));
+ mBinder.setQueue(new ParceledListSlice<Item>(queue));
} catch (RemoteException e) {
Log.wtf("Dead object in setQueue.", e);
}
@@ -512,8 +513,8 @@
postToCallback(CallbackMessageHandler.MSG_PLAY_SEARCH, query, extras);
}
- private void dispatchSkipToTrack(long id) {
- postToCallback(CallbackMessageHandler.MSG_SKIP_TO_TRACK, id);
+ private void dispatchSkipToItem(long id) {
+ postToCallback(CallbackMessageHandler.MSG_SKIP_TO_ITEM, id);
}
private void dispatchPause() {
@@ -782,9 +783,10 @@
}
/**
- * Override to handle requests to play a track with a given id from the play queue.
+ * Override to handle requests to play an item with a given id from the
+ * play queue.
*/
- public void onSkipToTrack(long id) {
+ public void onSkipToItem(long id) {
}
/**
@@ -916,7 +918,7 @@
public void onSkipToTrack(long id) {
MediaSession session = mMediaSession.get();
if (session != null) {
- session.dispatchSkipToTrack(id);
+ session.dispatchSkipToItem(id);
}
}
@@ -1015,12 +1017,12 @@
}
/**
- * A single track that is part of the play queue. It contains information necessary to display
- * a single track in the queue.
+ * A single item that is part of the play queue. It contains information
+ * necessary to display a single item in the queue.
*/
- public static final class Track implements Parcelable {
+ public static final class Item implements Parcelable {
/**
- * This id is reserved. No tracks can be explicitly asigned this id.
+ * This id is reserved. No items can be explicitly asigned this id.
*/
public static final int UNKNOWN_ID = -1;
@@ -1030,22 +1032,23 @@
private final Bundle mExtras;
/**
- * Create a new {@link MediaSession.Track}.
+ * Create a new {@link MediaSession.Item}.
*
- * @param metadata The metadata for this track.
- * @param id An identifier for this track. It must be unique within the play queue.
- * @param uri The uri for this track.
- * @param extras A bundle of extras that can be used to add extra information about the
- * track.
+ * @param metadata The metadata for this item.
+ * @param id An identifier for this item. It must be unique within the
+ * play queue.
+ * @param uri The uri for this item.
+ * @param extras A bundle of extras that can be used to add extra
+ * information about this item.
*/
- private Track(MediaMetadata metadata, long id, Uri uri, Bundle extras) {
+ private Item(MediaMetadata metadata, long id, Uri uri, Bundle extras) {
mMetadata = metadata;
mId = id;
mUri = uri;
mExtras = extras;
}
- private Track(Parcel in) {
+ private Item(Parcel in) {
mMetadata = MediaMetadata.CREATOR.createFromParcel(in);
mId = in.readLong();
mUri = Uri.CREATOR.createFromParcel(in);
@@ -1053,35 +1056,35 @@
}
/**
- * Get the metadata for this track.
+ * Get the metadata for this item.
*/
public MediaMetadata getMetadata() {
return mMetadata;
}
/**
- * Get the id for this track.
+ * Get the id for this item.
*/
public long getId() {
return mId;
}
/**
- * Get the Uri for this track.
+ * Get the Uri for this item.
*/
public Uri getUri() {
return mUri;
}
/**
- * Get the extras for this track.
+ * Get the extras for this item.
*/
public Bundle getExtras() {
return mExtras;
}
/**
- * Builder for {@link MediaSession.Track} objects.
+ * Builder for {@link MediaSession.Item} objects.
*/
public static final class Builder {
private final MediaMetadata mMetadata;
@@ -1096,15 +1099,15 @@
public Builder(MediaMetadata metadata, long id, Uri uri) {
if (metadata == null) {
throw new IllegalArgumentException(
- "You must specify a non-null MediaMetadata to build a Track.");
+ "You must specify a non-null MediaMetadata to build an Item.");
}
if (uri == null) {
throw new IllegalArgumentException(
- "You must specify a non-null Uri to build a Track.");
+ "You must specify a non-null Uri to build an Item.");
}
if (id == UNKNOWN_ID) {
throw new IllegalArgumentException(
- "You must specify an id other than UNKNOWN_ID to build a Track.");
+ "You must specify an id other than UNKNOWN_ID to build an Item.");
}
mMetadata = metadata;
mId = id;
@@ -1112,18 +1115,18 @@
}
/**
- * Set optional extras for the track.
+ * Set optional extras for the item.
*/
- public MediaSession.Track.Builder setExtras(Bundle extras) {
+ public MediaSession.Item.Builder setExtras(Bundle extras) {
mExtras = extras;
return this;
}
/**
- * Create the {@link Track}.
+ * Create the {@link Item}.
*/
- public MediaSession.Track build() {
- return new MediaSession.Track(mMetadata, mId, mUri, mExtras);
+ public MediaSession.Item build() {
+ return new MediaSession.Item(mMetadata, mId, mUri, mExtras);
}
}
@@ -1140,23 +1143,23 @@
return 0;
}
- public static final Creator<MediaSession.Track> CREATOR
- = new Creator<MediaSession.Track>() {
+ public static final Creator<MediaSession.Item> CREATOR
+ = new Creator<MediaSession.Item>() {
@Override
- public MediaSession.Track createFromParcel(Parcel p) {
- return new MediaSession.Track(p);
+ public MediaSession.Item createFromParcel(Parcel p) {
+ return new MediaSession.Item(p);
}
@Override
- public MediaSession.Track[] newArray(int size) {
- return new MediaSession.Track[size];
+ public MediaSession.Item[] newArray(int size) {
+ return new MediaSession.Item[size];
}
};
@Override
public String toString() {
- return "MediaSession.Track {" +
+ return "MediaSession.Item {" +
"Metadata=" + mMetadata +
", Id=" + mId +
", Uri=" + mUri +
@@ -1182,7 +1185,7 @@
private static final int MSG_PLAY = 1;
private static final int MSG_PLAY_URI = 2;
private static final int MSG_PLAY_SEARCH = 3;
- private static final int MSG_SKIP_TO_TRACK = 4;
+ private static final int MSG_SKIP_TO_ITEM = 4;
private static final int MSG_PAUSE = 5;
private static final int MSG_STOP = 6;
private static final int MSG_NEXT = 7;
@@ -1232,8 +1235,8 @@
case MSG_PLAY_SEARCH:
mCallback.onPlayFromSearch((String) msg.obj, msg.getData());
break;
- case MSG_SKIP_TO_TRACK:
- mCallback.onSkipToTrack((Long) msg.obj);
+ case MSG_SKIP_TO_ITEM:
+ mCallback.onSkipToItem((Long) msg.obj);
case MSG_PAUSE:
mCallback.onPause();
break;
diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java
index c2fb5a3..8a1e076 100644
--- a/media/java/android/media/session/MediaSessionManager.java
+++ b/media/java/android/media/session/MediaSessionManager.java
@@ -30,6 +30,7 @@
import android.os.UserHandle;
import android.service.notification.NotificationListenerService;
import android.text.TextUtils;
+import android.util.ArrayMap;
import android.util.Log;
import android.view.KeyEvent;
@@ -50,6 +51,9 @@
public final class MediaSessionManager {
private static final String TAG = "SessionManager";
+ private final ArrayMap<OnActiveSessionsChangedListener, SessionsChangedWrapper> mListeners
+ = new ArrayMap<OnActiveSessionsChangedListener, SessionsChangedWrapper>();
+ private final Object mLock = new Object();
private final ISessionManager mService;
private Context mContext;
@@ -141,10 +145,11 @@
* @param notificationListener The enabled notification listener component.
* May be null.
*/
- public void addActiveSessionsListener(@NonNull SessionListener sessionListener,
+ public void addOnActiveSessionsChangedListener(
+ @NonNull OnActiveSessionsChangedListener sessionListener,
@Nullable ComponentName notificationListener) {
- addActiveSessionsListener(sessionListener, notificationListener, UserHandle.myUserId(),
- null);
+ addOnActiveSessionsChangedListener(sessionListener, notificationListener,
+ UserHandle.myUserId(), null);
}
/**
@@ -163,7 +168,8 @@
* @param handler The handler to post updates on.
* @hide
*/
- public void addActiveSessionsListener(@NonNull SessionListener sessionListener,
+ public void addOnActiveSessionsChangedListener(
+ @NonNull OnActiveSessionsChangedListener sessionListener,
@Nullable ComponentName notificationListener, int userId, @Nullable Handler handler) {
if (sessionListener == null) {
throw new IllegalArgumentException("listener may not be null");
@@ -171,11 +177,18 @@
if (handler == null) {
handler = new Handler();
}
- sessionListener.setHandler(handler);
- try {
- mService.addSessionsListener(sessionListener.mStub, notificationListener, userId);
- } catch (RemoteException e) {
- Log.e(TAG, "Error in addActiveSessionsListener.", e);
+ synchronized (mLock) {
+ if (mListeners.get(sessionListener) != null) {
+ Log.w(TAG, "Attempted to add session listener twice, ignoring.");
+ return;
+ }
+ SessionsChangedWrapper wrapper = new SessionsChangedWrapper(sessionListener, handler);
+ try {
+ mService.addSessionsListener(wrapper.mStub, notificationListener, userId);
+ mListeners.put(sessionListener, wrapper);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error in addOnActiveSessionsChangedListener.", e);
+ }
}
}
@@ -184,14 +197,20 @@
*
* @param listener The listener to remove.
*/
- public void removeActiveSessionsListener(@NonNull SessionListener listener) {
+ public void removeOnActiveSessionsChangedListener(
+ @NonNull OnActiveSessionsChangedListener listener) {
if (listener == null) {
throw new IllegalArgumentException("listener may not be null");
}
- try {
- mService.removeSessionsListener(listener.mStub);
- } catch (RemoteException e) {
- Log.e(TAG, "Error in removeActiveSessionsListener.", e);
+ synchronized (mLock) {
+ SessionsChangedWrapper wrapper = mListeners.remove(listener);
+ if (wrapper != null) {
+ try {
+ mService.removeSessionsListener(wrapper.mStub);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error in removeOnActiveSessionsChangedListener.", e);
+ }
+ }
}
}
@@ -257,28 +276,18 @@
/**
* Listens for changes to the list of active sessions. This can be added
- * using {@link #addActiveSessionsListener}.
+ * using {@link #addOnActiveSessionsChangedListener}.
*/
- public static abstract class SessionListener {
- private final Context mContext;
- private Handler mHandler;
+ public interface OnActiveSessionsChangedListener {
+ public void onActiveSessionsChanged(@Nullable List<MediaController> controllers);
+ }
- public SessionListener(Context context) {
- mContext = context;
- }
- /**
- * Called when the list of active sessions has changed. This can be due
- * to a session being added or removed or the order of sessions
- * changing. The controllers will be provided in priority order with the
- * most important controller at index 0.
- *
- * @param controllers The updated list of controllers for the user that
- * changed.
- */
- public abstract void onActiveSessionsChanged(
- @Nullable List<MediaController> controllers);
+ private final class SessionsChangedWrapper {
+ private final OnActiveSessionsChangedListener mListener;
+ private final Handler mHandler;
- private final void setHandler(Handler handler) {
+ public SessionsChangedWrapper(OnActiveSessionsChangedListener listener, Handler handler) {
+ mListener = listener;
mHandler = handler;
}
@@ -295,7 +304,7 @@
for (int i = 0; i < size; i++) {
controllers.add(new MediaController(mContext, tokens.get(i)));
}
- SessionListener.this.onActiveSessionsChanged(controllers);
+ mListener.onActiveSessionsChanged(controllers);
}
});
}
diff --git a/media/java/android/media/session/ParcelableVolumeInfo.java b/media/java/android/media/session/ParcelableVolumeInfo.java
index e71b539..96a45d9b 100644
--- a/media/java/android/media/session/ParcelableVolumeInfo.java
+++ b/media/java/android/media/session/ParcelableVolumeInfo.java
@@ -21,7 +21,7 @@
/**
* Convenience class for passing information about the audio configuration of a
- * session. The public implementation is {@link MediaController.VolumeInfo}.
+ * session. The public implementation is {@link MediaController.AudioInfo}.
*
* @hide
*/
diff --git a/media/java/android/media/session/PlaybackState.java b/media/java/android/media/session/PlaybackState.java
index 2ad8eae..566e218 100644
--- a/media/java/android/media/session/PlaybackState.java
+++ b/media/java/android/media/session/PlaybackState.java
@@ -120,11 +120,11 @@
public static final long ACTION_PLAY_FROM_SEARCH = 1 << 11;
/**
- * Indicates this performer supports the skip to track command.
+ * Indicates this performer supports the skip to item command.
*
* @see Builder#setActions(long)
*/
- public static final long ACTION_SKIP_TO_TRACK = 1 << 12;
+ public static final long ACTION_SKIP_TO_ITEM = 1 << 12;
/**
* This is the default playback state and indicates that no media has been
@@ -223,11 +223,11 @@
private List<PlaybackState.CustomAction> mCustomActions;
private final CharSequence mErrorMessage;
private final long mUpdateTime;
- private final long mActiveTrackId;
+ private final long mActiveItemId;
private PlaybackState(int state, long position, long updateTime, float speed,
long bufferPosition, long transportControls,
- List<PlaybackState.CustomAction> customActions, long activeTrackId,
+ List<PlaybackState.CustomAction> customActions, long activeItemId,
CharSequence error) {
mState = state;
mPosition = position;
@@ -236,7 +236,7 @@
mBufferPosition = bufferPosition;
mActions = transportControls;
mCustomActions = new ArrayList<>(customActions);
- mActiveTrackId = activeTrackId;
+ mActiveItemId = activeItemId;
mErrorMessage = error;
}
@@ -248,7 +248,7 @@
mBufferPosition = in.readLong();
mActions = in.readLong();
mCustomActions = in.createTypedArrayList(CustomAction.CREATOR);
- mActiveTrackId = in.readLong();
+ mActiveItemId = in.readLong();
mErrorMessage = in.readCharSequence();
}
@@ -263,7 +263,7 @@
bob.append(", updated=").append(mUpdateTime);
bob.append(", actions=").append(mActions);
bob.append(", custom actions=").append(mCustomActions);
- bob.append(", active track id=").append(mActiveTrackId);
+ bob.append(", active item id=").append(mActiveItemId);
bob.append(", error=").append(mErrorMessage);
bob.append("}");
return bob.toString();
@@ -283,7 +283,7 @@
dest.writeLong(mBufferPosition);
dest.writeLong(mActions);
dest.writeTypedList(mCustomActions);
- dest.writeLong(mActiveTrackId);
+ dest.writeLong(mActiveItemId);
dest.writeCharSequence(mErrorMessage);
}
@@ -716,7 +716,7 @@
private long mActions;
private CharSequence mErrorMessage;
private long mUpdateTime;
- private long mActiveTrackId = MediaSession.Track.UNKNOWN_ID;
+ private long mActiveItemId = MediaSession.Item.UNKNOWN_ID;
/**
* Creates an initially empty state builder.
@@ -744,14 +744,14 @@
}
mErrorMessage = from.mErrorMessage;
mUpdateTime = from.mUpdateTime;
- mActiveTrackId = from.mActiveTrackId;
+ mActiveItemId = from.mActiveItemId;
}
/**
* Set the current state of playback.
* <p>
* The position must be in ms and indicates the current playback
- * position within the track. If the position is unknown use
+ * position within the item. If the position is unknown use
* {@link #PLAYBACK_POSITION_UNKNOWN}. When not using an unknown
* position the time at which the position was updated must be provided.
* It is okay to use {@link SystemClock#elapsedRealtime()} if the
@@ -773,7 +773,7 @@
* </ul>
*
* @param state The current state of playback.
- * @param position The position in the current track in ms.
+ * @param position The position in the current item in ms.
* @param playbackSpeed The current speed of playback as a multiple of
* normal playback.
* @param updateTime The time in the {@link SystemClock#elapsedRealtime}
@@ -792,7 +792,7 @@
* Set the current state of playback.
* <p>
* The position must be in ms and indicates the current playback
- * position within the track. If the position is unknown use
+ * position within the item. If the position is unknown use
* {@link #PLAYBACK_POSITION_UNKNOWN}. The update time will be set to
* the current {@link SystemClock#elapsedRealtime()}.
* <p>
@@ -812,7 +812,7 @@
* </ul>
*
* @param state The current state of playback.
- * @param position The position in the current track in ms.
+ * @param position The position in the current item in ms.
* @param playbackSpeed The current speed of playback as a multiple of
* normal playback.
* @return this
@@ -902,14 +902,14 @@
}
/**
- * Set the active track in the play queue by specifying its id.
- * The default value is {@link MediaSession.Track#UNKNOWN_ID}
+ * Set the active item in the play queue by specifying its id. The
+ * default value is {@link MediaSession.Item#UNKNOWN_ID}
*
- * @param id The id of the active track.
+ * @param id The id of the active item.
* @return this
*/
- public Builder setActiveTrack(long id) {
- mActiveTrackId = id;
+ public Builder setActiveItem(long id) {
+ mActiveItemId = id;
return this;
}
@@ -932,7 +932,7 @@
*/
public PlaybackState build() {
return new PlaybackState(mState, mPosition, mUpdateTime, mSpeed, mBufferPosition,
- mActions, mCustomActions, mActiveTrackId, mErrorMessage);
+ mActions, mCustomActions, mActiveItemId, mErrorMessage);
}
}
}
diff --git a/media/java/android/media/tv/ITvInputSession.aidl b/media/java/android/media/tv/ITvInputSession.aidl
index 99fb911..1aad2fa 100644
--- a/media/java/android/media/tv/ITvInputSession.aidl
+++ b/media/java/android/media/tv/ITvInputSession.aidl
@@ -29,7 +29,7 @@
oneway interface ITvInputSession {
void release();
- void setMainSession(boolean isMainSession);
+ void setMain(boolean isMain);
void setSurface(in Surface surface);
void dispatchSurfaceChanged(int format, int width, int height);
// TODO: Remove this once it becomes irrelevant for applications to handle audio focus. The plan
diff --git a/media/java/android/media/tv/ITvInputSessionWrapper.java b/media/java/android/media/tv/ITvInputSessionWrapper.java
index 5022cc1..58e46f0 100644
--- a/media/java/android/media/tv/ITvInputSessionWrapper.java
+++ b/media/java/android/media/tv/ITvInputSessionWrapper.java
@@ -42,7 +42,7 @@
private static final String TAG = "TvInputSessionWrapper";
private static final int DO_RELEASE = 1;
- private static final int DO_SET_MAIN_SESSION = 2;
+ private static final int DO_SET_MAIN = 2;
private static final int DO_SET_SURFACE = 3;
private static final int DO_DISPATCH_SURFACE_CHANGED = 4;
private static final int DO_SET_STREAM_VOLUME = 5;
@@ -91,8 +91,8 @@
}
return;
}
- case DO_SET_MAIN_SESSION: {
- mTvInputSessionImpl.setMainSession((Boolean) msg.obj);
+ case DO_SET_MAIN: {
+ mTvInputSessionImpl.setMain((Boolean) msg.obj);
return;
}
case DO_SET_SURFACE: {
@@ -162,8 +162,8 @@
}
@Override
- public void setMainSession(boolean isMain) {
- mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_SET_MAIN_SESSION, isMain));
+ public void setMain(boolean isMain) {
+ mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_SET_MAIN, isMain));
}
@Override
diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java
index 6a7433d..3f5697f 100644
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -158,17 +158,17 @@
}
/**
- * Create a new instance of the TvInputInfo class,
- * instantiating it from the given Context, ResolveInfo, and HdmiDeviceInfo.
+ * Create a new instance of the TvInputInfo class, instantiating it from the given Context,
+ * ResolveInfo, and HdmiDeviceInfo.
*
* @param service The ResolveInfo returned from the package manager about this TV input service.
* @param deviceInfo The HdmiDeviceInfo for a HDMI CEC logical device.
* @param parentId The ID of this TV input's parent input. {@code null} if none exists.
- * @param iconUri The {@link android.net.Uri} to load the icon image.
- * {@see android.content.ContentResolver#openInputStream}. If it is null, the application
- * icon of {@code service} will be loaded.
- * @param label The label of this TvInputInfo. If it is null or empty, {@code service} label
- * will be loaded.
+ * @param iconUri The {@link android.net.Uri} to load the icon image. See
+ * {@link android.content.ContentResolver#openInputStream}. If it is {@code null},
+ * the application icon of {@code service} will be loaded.
+ * @param label The label of this TvInputInfo. If it is {@code null} or empty, {@code service}
+ * label will be loaded.
* @hide
*/
@SystemApi
@@ -182,16 +182,16 @@
}
/**
- * Create a new instance of the TvInputInfo class,
- * instantiating it from the given Context, ResolveInfo, and TvInputHardwareInfo.
+ * Create a new instance of the TvInputInfo class, instantiating it from the given Context,
+ * ResolveInfo, and TvInputHardwareInfo.
*
* @param service The ResolveInfo returned from the package manager about this TV input service.
* @param hardwareInfo The TvInputHardwareInfo for a TV input hardware device.
- * @param iconUri The {@link android.net.Uri} to load the icon image.
- * {@see android.content.ContentResolver#openInputStream}. If it is null, the application
- * icon of {@code service} will be loaded.
- * @param label The label of this TvInputInfo. If it is null or empty, {@code service} label
- * will be loaded.
+ * @param iconUri The {@link android.net.Uri} to load the icon image. See
+ * {@link android.content.ContentResolver#openInputStream}. If it is {@code null},
+ * the application icon of {@code service} will be loaded.
+ * @param label The label of this TvInputInfo. If it is {@code null} or empty, {@code service}
+ * label will be loaded.
* @hide
*/
@SystemApi
@@ -620,7 +620,7 @@
return new HashSet<String>();
}
String[] ids = hiddenIdsString.split(TV_INPUT_SEPARATOR);
- return new HashSet(Arrays.asList(ids));
+ return new HashSet<>(Arrays.asList(ids));
}
/**
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index 6e075b2..45aa6d6 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -235,14 +235,14 @@
}
/**
- * This is called when {@link TvInputService.Session#layoutSurface} is called to
- * change the layout of surface.
+ * This is called when {@link TvInputService.Session#layoutSurface} is called to change the
+ * layout of surface.
*
* @param session A {@link TvInputManager.Session} associated with this callback
- * @param l Left position.
- * @param t Top position.
- * @param r Right position.
- * @param b Bottom position.
+ * @param left Left position.
+ * @param top Top position.
+ * @param right Right position.
+ * @param bottom Bottom position.
* @hide
*/
@SystemApi
@@ -1023,10 +1023,12 @@
}
/**
- * Sets this as main session. See {@link TvView#setMainTvView} for about meaning of "main".
- * @hide
+ * Sets this as the main session. The main session is a session whose corresponding TV
+ * input determines the HDMI-CEC active source device.
+ *
+ * @see TvView#setMain
*/
- public void setMainSession() {
+ void setMain() {
if (mToken == null) {
Log.w(TAG, "The session has been already released");
return;
@@ -1164,7 +1166,7 @@
* {@link TvTrackInfo#TYPE_SUBTITLE}.
* @param trackId The ID of the track to select. When {@code null}, the currently selected
* track of the given type will be unselected.
- * @see #getTracks()
+ * @see #getTracks
*/
public void selectTrack(int type, String trackId) {
if (type == TvTrackInfo.TYPE_AUDIO) {
@@ -1339,6 +1341,9 @@
Log.w(TAG, "The session has been already released");
return;
}
+ if (unblockedRating == null) {
+ throw new IllegalArgumentException("unblockedRating cannot be null");
+ }
try {
mService.requestUnblockContent(mToken, unblockedRating.flattenToString(), mUserId);
} catch (RemoteException e) {
@@ -1462,14 +1467,14 @@
// Assumes the event has already been removed from the queue.
void invokeFinishedInputEventCallback(PendingEvent p, boolean handled) {
p.mHandled = handled;
- if (p.mHandler.getLooper().isCurrentThread()) {
+ if (p.mEventHandler.getLooper().isCurrentThread()) {
// Already running on the callback handler thread so we can send the callback
// immediately.
p.run();
} else {
// Post the event to the callback handler thread.
// In this case, the callback will be responsible for recycling the event.
- Message msg = Message.obtain(p.mHandler, p);
+ Message msg = Message.obtain(p.mEventHandler, p);
msg.setAsynchronous(true);
msg.sendToTarget();
}
@@ -1494,9 +1499,9 @@
p = new PendingEvent();
}
p.mEvent = event;
- p.mToken = token;
+ p.mEventToken = token;
p.mCallback = callback;
- p.mHandler = handler;
+ p.mEventHandler = handler;
return p;
}
@@ -1568,24 +1573,24 @@
private final class PendingEvent implements Runnable {
public InputEvent mEvent;
- public Object mToken;
+ public Object mEventToken;
public FinishedInputEventCallback mCallback;
- public Handler mHandler;
+ public Handler mEventHandler;
public boolean mHandled;
public void recycle() {
mEvent = null;
- mToken = null;
+ mEventToken = null;
mCallback = null;
- mHandler = null;
+ mEventHandler = null;
mHandled = false;
}
@Override
public void run() {
- mCallback.onFinishedInputEvent(mToken, mHandled);
+ mCallback.onFinishedInputEvent(mEventToken, mHandled);
- synchronized (mHandler) {
+ synchronized (mEventHandler) {
recyclePendingEventLocked(this);
}
}
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index 8ffe6cc..e3292b6 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -94,6 +94,8 @@
private final RemoteCallbackList<ITvInputServiceCallback> mCallbacks =
new RemoteCallbackList<ITvInputServiceCallback>();
+ private TvInputManager mTvInputManager;
+
@Override
public final IBinder onBind(Intent intent) {
return new ITvInputService.Stub() {
@@ -225,6 +227,17 @@
return null;
}
+ private boolean isPassthroughInput(String inputId) {
+ if (mTvInputManager == null) {
+ mTvInputManager = (TvInputManager) getSystemService(Context.TV_INPUT_SERVICE);
+ }
+ TvInputInfo info = mTvInputManager.getTvInputInfo(inputId);
+ if (info != null && info.isPassthroughInput()) {
+ return true;
+ }
+ return false;
+ }
+
/**
* Base class for derived classes to implement to provide a TV input session.
*/
@@ -504,12 +517,13 @@
/**
* Assigns a position of the {@link Surface} passed by {@link #onSetSurface}. The position
- * is relative to an overlay view. {@see #onOverlayViewSizeChanged}.
+ * is relative to an overlay view.
*
* @param left Left position in pixels, relative to the overlay view.
* @param top Top position in pixels, relative to the overlay view.
* @param right Right position in pixels, relative to the overlay view.
* @param bottm Bottom position in pixels, relative to the overlay view.
+ * @see #onOverlayViewSizeChanged
* @hide
*/
@SystemApi
@@ -537,29 +551,30 @@
public abstract void onRelease();
/**
- * Set the current session as the "main" session. See {@link TvView#setMainTvView} for the
- * meaning of "main".
+ * Sets the current session as the main session. The main session is a session whose
+ * corresponding TV input determines the HDMI-CEC active source device.
* <p>
- * This is primarily for HDMI-CEC active source management. TV input service that manages
- * HDMI-CEC logical device should make sure not only to select the corresponding HDMI
- * logical device as source device on {@code onSetMainSession(true)}, but also to select
- * internal device on {@code onSetMainSession(false)}. Also, if surface is set to non-main
- * session, it needs to select internal device after temporarily selecting corresponding
- * HDMI logical device for set up.
+ * TV input service that manages HDMI-CEC logical device should implement {@link
+ * #onSetMain} to (1) select the corresponding HDMI logical device as the source device
+ * when {@code isMain} is {@code true}, and to (2) select the internal device (= TV itself)
+ * as the source device when {@code isMain} is {@code false} and the session is still main.
+ * Also, if a surface is passed to a non-main session and active source is changed to
+ * initiate the surface, the active source should be returned to the main session.
* </p><p>
- * It is guaranteed that {@code onSetMainSession(true)} for new session is called first,
- * and {@code onSetMainSession(false)} for old session is called afterwards. This allows
- * {@code onSetMainSession(false)} to be no-op when TV input service knows that the next
- * main session corresponds to another HDMI logical device. Practically, this implies that
- * one TV input service should handle all HDMI port and HDMI-CEC logical devices for smooth
- * active source transition.
+ * {@link TvView} guarantees that, when tuning involves a session transition, {@code
+ * onSetMain(true)} for new session is called first, {@code onSetMain(false)} for old
+ * session is called afterwards. This allows {@code onSetMain(false)} to be no-op when TV
+ * input service knows that the next main session corresponds to another HDMI logical
+ * device. Practically, this implies that one TV input service should handle all HDMI port
+ * and HDMI-CEC logical devices for smooth active source transition.
* </p>
*
- * @param isMainSession If true, session is main.
+ * @param isMain If true, session should become main.
+ * @see TvView#setMain
* @hide
*/
@SystemApi
- public void onSetMainSession(boolean isMainSession) {
+ public void onSetMain(boolean isMain) {
}
/**
@@ -827,10 +842,10 @@
}
/**
- * Calls {@link #onSetMainSession}.
+ * Calls {@link #onSetMain}.
*/
- void setMainSession(boolean isMainSession) {
- onSetMainSession(isMainSession);
+ void setMain(boolean isMain) {
+ onSetMain(isMain);
}
/**
@@ -1228,9 +1243,14 @@
HardwareSession proxySession =
((HardwareSession) sessionImpl);
String harewareInputId = proxySession.getHardwareInputId();
- if (TextUtils.isEmpty(harewareInputId)) {
+ if (TextUtils.isEmpty(harewareInputId) ||
+ !isPassthroughInput(harewareInputId)) {
+ if (TextUtils.isEmpty(harewareInputId)) {
+ Log.w(TAG, "Hardware input id is not setup yet.");
+ } else {
+ Log.w(TAG, "Invalid hardware input id : " + harewareInputId);
+ }
sessionImpl.onRelease();
- Log.w(TAG, "Hardware input id is not setup yet.");
try {
cb.onSessionCreated(null, null);
} catch (RemoteException e) {
@@ -1238,7 +1258,6 @@
}
return;
}
- // TODO: check if the given ID is really hardware TV input.
proxySession.mProxySession = stub;
proxySession.mProxySessionCallback = cb;
proxySession.mServiceHandler = mServiceHandler;
diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java
index 591f543..445194e 100644
--- a/media/java/android/media/tv/TvView.java
+++ b/media/java/android/media/tv/TvView.java
@@ -116,8 +116,10 @@
private final SurfaceHolder.Callback mSurfaceHolderCallback = new SurfaceHolder.Callback() {
@Override
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
- Log.d(TAG, "surfaceChanged(holder=" + holder + ", format=" + format + ", width=" + width
- + ", height=" + height + ")");
+ if (DEBUG) {
+ Log.d(TAG, "surfaceChanged(holder=" + holder + ", format=" + format + ", width="
+ + width + ", height=" + height + ")");
+ }
mSurfaceFormat = format;
mSurfaceWidth = width;
mSurfaceHeight = height;
@@ -188,24 +190,27 @@
}
/**
- * Sets this as main TvView.
+ * Sets this as the main {@link TvView}.
* <p>
- * Main TvView is the TvView which user is watching and interacting mainly. It is used for
- * determining internal behavior of hardware TV input devices. For example, this influences
- * how HDMI-CEC active source will be managed.
+ * The main {@link TvView} is a {@link TvView} whose corresponding TV input determines the
+ * HDMI-CEC active source device. For an HDMI port input, one of source devices that is
+ * connected to that HDMI port becomes the active source. For an HDMI-CEC logical device input,
+ * the corresponding HDMI-CEC logical device becomes the active source. For any non-HDMI input
+ * (including the tuner, composite, S-Video, etc.), the internal device (= TV itself) becomes
+ * the active source.
* </p><p>
- * First tuned TvView becomes main automatically, and keeps to be main until setMainTvView() is
- * called for other TvView. Note that main TvView won't be reset even when current main TvView
- * is removed from view hierarchy.
+ * First tuned {@link TvView} becomes main automatically, and keeps to be main until {@link
+ * #setMain} is called for other {@link TvView}. Note that main {@link TvView} won't be reset
+ * even when current main {@link TvView} is removed from view hierarchy.
* </p>
* @hide
*/
@SystemApi
- public void setMainTvView() {
+ public void setMain() {
synchronized (sMainTvViewLock) {
sMainTvView = this;
if (hasWindowFocus() && mSession != null) {
- mSession.setMainSession();
+ mSession.setMain();
}
}
}
@@ -327,6 +332,7 @@
* This method is primarily used to un-tune the current TvView.
*/
public void reset() {
+ if (DEBUG) Log.d(TAG, "reset()");
if (mSession != null) {
release();
resetSurfaceView();
@@ -538,7 +544,7 @@
// Set main again to regain main session.
synchronized (sMainTvViewLock) {
if (hasFocus && this == sMainTvView && mSession != null) {
- mSession.setMainSession();
+ mSession.setMain();
}
}
}
@@ -596,6 +602,7 @@
mSurfaceView.getHolder().removeCallback(mSurfaceHolderCallback);
removeView(mSurfaceView);
}
+ mSurface = null;
mSurfaceView = new SurfaceView(getContext(), mAttrs, mDefStyleAttr) {
@Override
protected void updateWindow(boolean force, boolean redrawNeeded) {
@@ -821,11 +828,14 @@
}
return;
}
+ if (DEBUG) {
+ Log.d(TAG, "onSessionCreated()");
+ }
mSession = session;
if (session != null) {
synchronized (sMainTvViewLock) {
if (hasWindowFocus() && TvView.this == sMainTvView) {
- mSession.setMainSession();
+ mSession.setMain();
}
}
// mSurface may not be ready yet as soon as starting an application.
diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
index 20a621b..4c225c1 100644
--- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
+++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
@@ -16,11 +16,13 @@
package com.android.defcontainer;
+import static android.net.TrafficStats.MB_IN_BYTES;
+
import android.app.IntentService;
+import android.content.Context;
import android.content.Intent;
import android.content.pm.IPackageManager;
import android.content.pm.PackageCleanItem;
-import android.content.pm.PackageInfo;
import android.content.pm.PackageInfoLite;
import android.content.pm.PackageManager;
import android.content.pm.PackageParser;
@@ -37,8 +39,6 @@
import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceManager;
-import android.os.StatFs;
-import android.provider.Settings;
import android.system.ErrnoException;
import android.system.Os;
import android.system.StructStatVfs;
@@ -50,13 +50,11 @@
import com.android.internal.os.IParcelFileDescriptorFactory;
import com.android.internal.util.ArrayUtils;
-import dalvik.system.VMRuntime;
import libcore.io.IoUtils;
import libcore.io.Streams;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -155,10 +153,12 @@
* containing one or more APKs.
*/
@Override
- public PackageInfoLite getMinimalPackageInfo(final String packagePath, int flags,
- long threshold, String abiOverride) {
- PackageInfoLite ret = new PackageInfoLite();
+ public PackageInfoLite getMinimalPackageInfo(String packagePath, int flags,
+ String abiOverride) {
+ final Context context = DefaultContainerService.this;
+ final boolean isForwardLocked = (flags & PackageManager.INSTALL_FORWARD_LOCK) != 0;
+ PackageInfoLite ret = new PackageInfoLite();
if (packagePath == null) {
Slog.i(TAG, "Invalid package file " + packagePath);
ret.recommendedInstallLocation = PackageHelper.RECOMMEND_FAILED_INVALID_APK;
@@ -167,10 +167,12 @@
final File packageFile = new File(packagePath);
final PackageParser.PackageLite pkg;
+ final long sizeBytes;
try {
pkg = PackageParser.parsePackageLite(packageFile, 0);
- } catch (PackageParserException e) {
- Slog.w(TAG, "Failed to parse package at " + packagePath);
+ sizeBytes = calculateInstalledSizeInner(pkg, isForwardLocked, abiOverride);
+ } catch (PackageParserException | IOException e) {
+ Slog.w(TAG, "Failed to parse package at " + packagePath + ": " + e);
if (!packageFile.exists()) {
ret.recommendedInstallLocation = PackageHelper.RECOMMEND_FAILED_INVALID_URI;
@@ -185,55 +187,13 @@
ret.versionCode = pkg.versionCode;
ret.installLocation = pkg.installLocation;
ret.verifiers = pkg.verifiers;
- ret.recommendedInstallLocation = recommendAppInstallLocation(pkg, flags, threshold,
- abiOverride);
+ ret.recommendedInstallLocation = PackageHelper.resolveInstallLocation(context,
+ pkg.installLocation, sizeBytes, flags);
ret.multiArch = pkg.multiArch;
return ret;
}
- /**
- * Determine if package will fit on internal storage.
- *
- * @param packagePath absolute path to the package to be copied. Can be
- * a single monolithic APK file or a cluster directory
- * containing one or more APKs.
- */
- @Override
- public boolean checkInternalFreeStorage(String packagePath, boolean isForwardLocked,
- long threshold) throws RemoteException {
- final File packageFile = new File(packagePath);
- final PackageParser.PackageLite pkg;
- try {
- pkg = PackageParser.parsePackageLite(packageFile, 0);
- return isUnderInternalThreshold(pkg, isForwardLocked, threshold);
- } catch (PackageParserException | IOException e) {
- Slog.w(TAG, "Failed to parse package at " + packagePath);
- return false;
- }
- }
-
- /**
- * Determine if package will fit on external storage.
- *
- * @param packagePath absolute path to the package to be copied. Can be
- * a single monolithic APK file or a cluster directory
- * containing one or more APKs.
- */
- @Override
- public boolean checkExternalFreeStorage(String packagePath, boolean isForwardLocked,
- String abiOverride) throws RemoteException {
- final File packageFile = new File(packagePath);
- final PackageParser.PackageLite pkg;
- try {
- pkg = PackageParser.parsePackageLite(packageFile, 0);
- return isUnderExternalThreshold(pkg, isForwardLocked, abiOverride);
- } catch (PackageParserException | IOException e) {
- Slog.w(TAG, "Failed to parse package at " + packagePath);
- return false;
- }
- }
-
@Override
public ObbInfo getObbInfo(String filename) {
try {
@@ -295,13 +255,10 @@
final PackageParser.PackageLite pkg;
try {
pkg = PackageParser.parsePackageLite(packageFile, 0);
- return calculateContainerSize(pkg, isForwardLocked, abiOverride) * 1024 * 1024;
+ return calculateInstalledSizeInner(pkg, isForwardLocked, abiOverride);
} catch (PackageParserException | IOException e) {
- /*
- * Okay, something failed, so let's just estimate it to be 2x
- * the file size. Note this will be 0 if the file doesn't exist.
- */
- return packageFile.length() * 2;
+ Slog.w(TAG, "Failed to calculate installed size: " + e);
+ return Long.MAX_VALUE;
}
}
};
@@ -381,10 +338,12 @@
return null;
}
- // Calculate size of container needed to hold base APK.
+ // Calculate size of container needed to hold base APK. Round up to
+ // nearest MB, and tack on an extra MB for filesystem overhead.
final int sizeMb;
try {
- sizeMb = calculateContainerSize(pkg, handle, isForwardLocked, abis);
+ final long sizeBytes = calculateInstalledSizeInner(pkg, handle, isForwardLocked, abis);
+ sizeMb = ((int) ((sizeBytes + MB_IN_BYTES) / MB_IN_BYTES)) + 1;
} catch (IOException e) {
Slog.w(TAG, "Problem when trying to copy " + codeFile.getPath());
return null;
@@ -523,124 +482,23 @@
}
}
- private static final int PREFER_INTERNAL = 1;
- private static final int PREFER_EXTERNAL = 2;
-
- private int recommendAppInstallLocation(PackageLite pkg, int flags, long threshold,
- String abiOverride) {
- int prefer;
- boolean checkBoth = false;
-
- final boolean isForwardLocked = (flags & PackageManager.INSTALL_FORWARD_LOCK) != 0;
-
- check_inner : {
- /*
- * Explicit install flags should override the manifest settings.
- */
- if ((flags & PackageManager.INSTALL_INTERNAL) != 0) {
- prefer = PREFER_INTERNAL;
- break check_inner;
- } else if ((flags & PackageManager.INSTALL_EXTERNAL) != 0) {
- prefer = PREFER_EXTERNAL;
- break check_inner;
- }
-
- /* No install flags. Check for manifest option. */
- if (pkg.installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
- prefer = PREFER_INTERNAL;
- break check_inner;
- } else if (pkg.installLocation == PackageInfo.INSTALL_LOCATION_PREFER_EXTERNAL) {
- prefer = PREFER_EXTERNAL;
- checkBoth = true;
- break check_inner;
- } else if (pkg.installLocation == PackageInfo.INSTALL_LOCATION_AUTO) {
- // We default to preferring internal storage.
- prefer = PREFER_INTERNAL;
- checkBoth = true;
- break check_inner;
- }
-
- // Pick user preference
- int installPreference = Settings.Global.getInt(getApplicationContext()
- .getContentResolver(),
- Settings.Global.DEFAULT_INSTALL_LOCATION,
- PackageHelper.APP_INSTALL_AUTO);
- if (installPreference == PackageHelper.APP_INSTALL_INTERNAL) {
- prefer = PREFER_INTERNAL;
- break check_inner;
- } else if (installPreference == PackageHelper.APP_INSTALL_EXTERNAL) {
- prefer = PREFER_EXTERNAL;
- break check_inner;
- }
-
- /*
- * Fall back to default policy of internal-only if nothing else is
- * specified.
- */
- prefer = PREFER_INTERNAL;
- }
-
- final boolean emulated = Environment.isExternalStorageEmulated();
-
- boolean fitsOnInternal = false;
- if (checkBoth || prefer == PREFER_INTERNAL) {
- try {
- fitsOnInternal = isUnderInternalThreshold(pkg, isForwardLocked, threshold);
- } catch (IOException e) {
- return PackageHelper.RECOMMEND_FAILED_INVALID_URI;
- }
- }
-
- boolean fitsOnSd = false;
- if (!emulated && (checkBoth || prefer == PREFER_EXTERNAL)) {
- try {
- fitsOnSd = isUnderExternalThreshold(pkg, isForwardLocked, abiOverride);
- } catch (IOException e) {
- return PackageHelper.RECOMMEND_FAILED_INVALID_URI;
- }
- }
-
- if (prefer == PREFER_INTERNAL) {
- if (fitsOnInternal) {
- return PackageHelper.RECOMMEND_INSTALL_INTERNAL;
- }
- } else if (!emulated && prefer == PREFER_EXTERNAL) {
- if (fitsOnSd) {
- return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;
- }
- }
-
- if (checkBoth) {
- if (fitsOnInternal) {
- return PackageHelper.RECOMMEND_INSTALL_INTERNAL;
- } else if (!emulated && fitsOnSd) {
- return PackageHelper.RECOMMEND_INSTALL_EXTERNAL;
- }
- }
-
- /*
- * If they requested to be on the external media by default, return that
- * the media was unavailable. Otherwise, indicate there was insufficient
- * storage space available.
- */
- if (!emulated && (checkBoth || prefer == PREFER_EXTERNAL)
- && !Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
- return PackageHelper.RECOMMEND_MEDIA_UNAVAILABLE;
- } else {
- return PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE;
+ private long calculateInstalledSizeInner(PackageLite pkg, boolean isForwardLocked,
+ String abiOverride) throws IOException {
+ NativeLibraryHelper.Handle handle = null;
+ try {
+ handle = NativeLibraryHelper.Handle.create(pkg);
+ return calculateInstalledSizeInner(pkg, handle, isForwardLocked,
+ calculateAbiList(handle, abiOverride, pkg.multiArch));
+ } finally {
+ IoUtils.closeQuietly(handle);
}
}
- /**
- * Measure a file to see if it fits within the free space threshold.
- *
- * @param threshold byte threshold to compare against
- * @return true if file fits under threshold
- * @throws FileNotFoundException when APK does not exist
- */
- private boolean isUnderInternalThreshold(PackageLite pkg, boolean isForwardLocked,
- long threshold) throws IOException {
+ private long calculateInstalledSizeInner(PackageLite pkg, NativeLibraryHelper.Handle handle,
+ boolean isForwardLocked, String[] abis) throws IOException {
long sizeBytes = 0;
+
+ // Include raw APKs, and possibly unpacked resources
for (String codePath : pkg.getAllCodePaths()) {
sizeBytes += new File(codePath).length();
@@ -649,47 +507,12 @@
}
}
- final StatFs stat = new StatFs(Environment.getDataDirectory().getPath());
- final long availBytes = stat.getAvailableBytes();
- return (availBytes - sizeBytes) > threshold;
- }
-
- /**
- * Measure a file to see if it fits in the external free space.
- *
- * @return true if file fits
- * @throws IOException when file does not exist
- */
- private boolean isUnderExternalThreshold(PackageLite pkg, boolean isForwardLocked,
- String abiOverride) throws IOException {
- if (Environment.isExternalStorageEmulated()) {
- return false;
+ // Include all relevant native code
+ if (!ArrayUtils.isEmpty(abis)) {
+ sizeBytes += NativeLibraryHelper.sumNativeBinariesLI(handle, abis);
}
- final int sizeMb = calculateContainerSize(pkg, isForwardLocked, abiOverride);
-
- final int availSdMb;
- if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
- final StatFs sdStats = new StatFs(Environment.getExternalStorageDirectory().getPath());
- final int blocksToMb = (1 << 20) / sdStats.getBlockSize();
- availSdMb = sdStats.getAvailableBlocks() * blocksToMb;
- } else {
- availSdMb = -1;
- }
-
- return availSdMb > sizeMb;
- }
-
- private int calculateContainerSize(PackageLite pkg, boolean isForwardLocked, String abiOverride)
- throws IOException {
- NativeLibraryHelper.Handle handle = null;
- try {
- handle = NativeLibraryHelper.Handle.create(pkg);
- return calculateContainerSize(pkg, handle, isForwardLocked,
- calculateAbiList(handle, abiOverride, pkg.multiArch));
- } finally {
- IoUtils.closeQuietly(handle);
- }
+ return sizeBytes;
}
private String[] calculateAbiList(NativeLibraryHelper.Handle handle, String abiOverride,
@@ -731,43 +554,4 @@
return null;
}
-
- /**
- * Calculate the container size for a package.
- *
- * @return size in megabytes (2^20 bytes)
- * @throws IOException when there is a problem reading the file
- */
- private int calculateContainerSize(PackageLite pkg, NativeLibraryHelper.Handle handle,
- boolean isForwardLocked, String[] abis) throws IOException {
- // Calculate size of container needed to hold APKs.
- long sizeBytes = 0;
- for (String codePath : pkg.getAllCodePaths()) {
- sizeBytes += new File(codePath).length();
-
- if (isForwardLocked) {
- sizeBytes += PackageHelper.extractPublicFiles(codePath, null);
- }
- }
-
- // Check all the native files that need to be copied and add that to the
- // container size.
- if (abis != null) {
- sizeBytes += NativeLibraryHelper.sumNativeBinariesLI(handle, abis);
- }
-
- int sizeMb = (int) (sizeBytes >> 20);
- if ((sizeBytes - (sizeMb * 1024 * 1024)) > 0) {
- sizeMb++;
- }
-
- /*
- * Add buffer size because we don't have a good way to determine the
- * real FAT size. Your FAT size varies with how many directory entries
- * you need, how big the whole filesystem is, and other such headaches.
- */
- sizeMb++;
-
- return sizeMb;
- }
}
diff --git a/packages/PrintSpooler/AndroidManifest.xml b/packages/PrintSpooler/AndroidManifest.xml
index 9a62864..055587a 100644
--- a/packages/PrintSpooler/AndroidManifest.xml
+++ b/packages/PrintSpooler/AndroidManifest.xml
@@ -46,7 +46,7 @@
android:label="@string/app_label"
android:allowBackup= "false"
android:supportsRtl="true"
- android:icon="@*android:drawable/ic_print">
+ android:icon="@drawable/ic_print">
<service
android:name=".model.PrintSpoolerService"
diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png
deleted file mode 100644
index 09ab1a2..0000000
--- a/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png
+++ /dev/null
Binary files differ
diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png
deleted file mode 100644
index 637d94e..0000000
--- a/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png
+++ /dev/null
Binary files differ
diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png
deleted file mode 100644
index 4d4b3cc..0000000
--- a/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png
+++ /dev/null
Binary files differ
diff --git a/packages/PrintSpooler/res/drawable/ic_print.xml b/packages/PrintSpooler/res/drawable/ic_print.xml
new file mode 100644
index 0000000..dc6e0fb
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable/ic_print.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@*android:drawable/ic_print"
+ android:tint="@color/promoted_action_background_color" />
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
index 7715579..3905bada 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
@@ -96,7 +96,7 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- getActionBar().setIcon(R.drawable.ic_menu_print);
+ getActionBar().setIcon(R.drawable.ic_print);
setContentView(R.layout.select_printer_activity);
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index b8836a0..cbea664 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -111,7 +111,7 @@
<uses-permission android:name="android.permission.CAMERA" />
<!-- Screen Capturing -->
- <uses-permission android:name="android.permission.CREATE_MEDIA_PROJECTION" />
+ <uses-permission android:name="android.permission.MANAGE_MEDIA_PROJECTION" />
<application
android:name=".SystemUIApplication"
diff --git a/packages/SystemUI/res/drawable/ic_qs_bugreport.xml b/packages/SystemUI/res/drawable/ic_qs_bugreport.xml
deleted file mode 100644
index 0df1a96..0000000
--- a/packages/SystemUI/res/drawable/ic_qs_bugreport.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="64dp"
- android:height="64dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
-
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M20.0,8.0l-2.8,0.0c-0.5,-0.8 -1.1,-1.5 -1.8,-2.0L17.0,4.4L15.6,3.0l-2.2,2.2C13.0,5.1 12.5,5.0 12.0,5.0s-1.0,0.1 -1.4,0.2L8.4,3.0L7.0,4.4L8.6,6.0C7.9,6.5 7.3,7.2 6.8,8.0L4.0,8.0l0.0,2.0l2.1,0.0C6.0,10.3 6.0,10.7 6.0,11.0l0.0,1.0L4.0,12.0l0.0,2.0l2.0,0.0l0.0,1.0c0.0,0.3 0.0,0.7 0.1,1.0L4.0,16.0l0.0,2.0l2.8,0.0c1.0,1.8 3.0,3.0 5.2,3.0s4.2,-1.2 5.2,-3.0L20.0,18.0l0.0,-2.0l-2.1,0.0c0.1,-0.3 0.1,-0.7 0.1,-1.0l0.0,-1.0l2.0,0.0l0.0,-2.0l-2.0,0.0l0.0,-1.0c0.0,-0.3 0.0,-0.7 -0.1,-1.0L20.0,10.0L20.0,8.0zM14.0,16.0l-4.0,0.0l0.0,-2.0l4.0,0.0L14.0,16.0zM14.0,12.0l-4.0,0.0l0.0,-2.0l4.0,0.0L14.0,12.0z"/>
-</vector>
diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
index fcc0f4a..faa2820 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -60,7 +60,8 @@
android:paddingEnd="@dimen/battery_level_padding_end"
android:textColor="#ffffff"
android:visibility="gone"
- android:textSize="@dimen/battery_level_text_size"/>
+ android:textSize="@dimen/battery_level_text_size"
+ android:importantForAccessibility="noHideDescendants"/>
</LinearLayout>
<com.android.keyguard.CarrierText
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
index 079b97b..aa276bc 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
@@ -72,7 +72,8 @@
android:layout_marginStart="@dimen/header_battery_margin_expanded"
android:paddingEnd="@dimen/battery_level_padding_end"
android:textColor="#ffffff"
- android:textSize="@dimen/battery_level_text_size"/>
+ android:textSize="@dimen/battery_level_text_size"
+ android:importantForAccessibility="noHideDescendants"/>
</LinearLayout>
<TextView
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index d145172..1bd0561 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -273,6 +273,13 @@
<!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_wifi_signal_full">Wifi signal full.</string>
+ <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_wifi_name">Connected to <xliff:g id="wifi" example="Home Network">%s</xliff:g>.</string>
+
+ <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_bluetooth_name">Connected to <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
+
+
<!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_no_wimax">No WiMAX.</string>
<!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -390,6 +397,8 @@
<string name="accessibility_desc_notification_shade">Notification shade.</string>
<!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_desc_quick_settings">Quick settings.</string>
+ <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_desc_lock_screen">Lock screen.</string>
<!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
<string name="accessibility_desc_settings">Settings</string>
<!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -398,7 +407,7 @@
<!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_user">User <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>
<!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
- <string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="network" example="MyWifiNetwork">%2$s</xliff:g></string>
+ <string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>.</string>
<!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_mobile">Mobile <xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="type" example="4G">%2$s</xliff:g>. <xliff:g id="network" example="T-Mobile">%3$s</xliff:g>.</string>
<!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -577,7 +586,7 @@
<!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
<string name="quick_settings_cellular_detail_remaining_data">Remaining data</string>
<!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
- <string name="quick_settings_cellular_detail_over_limit">Over limit</string>
+ <string name="quick_settings_cellular_detail_over_limit">Limit reached – data usage paused</string>
<!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
<string name="quick_settings_cellular_detail_data_used"><xliff:g id="data_used" example="2.0 GB">%s</xliff:g> used</string>
<!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
@@ -659,8 +668,6 @@
<!-- Shows when people have clicked at the right edge of the screen to explain how to open the phone. In right-to-left languages, this is the opposite direction. [CHAR LIMIT=60] -->
<string name="camera_hint">Swipe left for camera</string>
- <string name="bugreport_tile_extended" translatable="false">%s\n%s (%s)</string>
-
<!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
<string name="zen_mode_forever">Indefinitely</string>
diff --git a/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java b/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java
index 1ac8295..b3c0783 100644
--- a/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java
@@ -63,13 +63,13 @@
});
final Dialog dialog = builder.create();
+ dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
public void onDismiss(DialogInterface dialog) {
finish();
}
});
- dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
dialog.show();
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index 1fa97bd..bf01b7b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -347,8 +347,8 @@
}
for (TileRecord record : mRecords) {
- if (record.tileView.getVisibility() == GONE) continue;
record.tileView.setDual(record.tile.supportsDualTargets());
+ if (record.tileView.getVisibility() == GONE) continue;
final int cw = record.row == 0 ? mLargeCellWidth : mCellWidth;
final int ch = record.row == 0 ? mLargeCellHeight : mCellHeight;
record.tileView.measure(exactly(cw), exactly(ch));
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
index 6975541..409cc46 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
@@ -286,6 +286,7 @@
public Drawable icon;
public String label;
public String contentDescription;
+ public String dualLabelContentDescription;
public boolean copyTo(State other) {
if (other == null) throw new IllegalArgumentException();
@@ -294,12 +295,15 @@
|| other.iconId != iconId
|| !Objects.equals(other.icon, icon)
|| !Objects.equals(other.label, label)
- || !Objects.equals(other.contentDescription, contentDescription);
+ || !Objects.equals(other.contentDescription, contentDescription)
+ || !Objects.equals(other.dualLabelContentDescription,
+ dualLabelContentDescription);
other.visible = visible;
other.iconId = iconId;
other.icon = icon;
other.label = label;
other.contentDescription = contentDescription;
+ other.dualLabelContentDescription = dualLabelContentDescription;
return changed;
}
@@ -315,6 +319,7 @@
sb.append(",icon=").append(icon);
sb.append(",label=").append(label);
sb.append(",contentDescription=").append(contentDescription);
+ sb.append(",dualLabelContentDescription=").append(dualLabelContentDescription);
return sb.append(']');
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
index 597bb93..2cc1f07 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
@@ -87,6 +87,7 @@
private void recreateLabel() {
CharSequence labelText = null;
+ CharSequence labelDescription = null;
if (mLabel != null) {
labelText = mLabel.getText();
removeView(mLabel);
@@ -94,6 +95,7 @@
}
if (mDualLabel != null) {
labelText = mDualLabel.getText();
+ labelDescription = mLabel.getContentDescription();
removeView(mDualLabel);
mDualLabel = null;
}
@@ -113,6 +115,9 @@
if (labelText != null) {
mDualLabel.setText(labelText);
}
+ if (labelDescription != null) {
+ mDualLabel.setContentDescription(labelDescription);
+ }
addView(mDualLabel);
} else {
mLabel = new TextView(mContext);
@@ -228,6 +233,7 @@
}
if (mDual) {
mDualLabel.setText(state.label);
+ mDualLabel.setContentDescription(state.dualLabelContentDescription);
} else {
mLabel.setText(state.label);
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
index 1b2c0b0..19b9ec1 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -114,6 +114,12 @@
}
state.contentDescription = mContext.getString(
R.string.accessibility_quick_settings_bluetooth, stateContentDescription);
+ String bluetoothName = state.label;
+ if (connected) {
+ bluetoothName = state.dualLabelContentDescription = mContext.getString(
+ R.string.accessibility_bluetooth_name, state.label);
+ }
+ state.dualLabelContentDescription = bluetoothName;
}
private final BluetoothController.Callback mCallback = new BluetoothController.Callback() {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java
deleted file mode 100644
index a308e84..0000000
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.qs.tiles;
-
-import android.app.ActivityManagerNative;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.os.Build;
-import android.os.RemoteException;
-import android.provider.Settings.Global;
-import android.view.WindowManager;
-import android.view.WindowManagerGlobal;
-
-import com.android.systemui.R;
-import com.android.systemui.qs.GlobalSetting;
-import com.android.systemui.qs.QSTile;
-
-/** Quick settings tile: Bug report **/
-public class BugreportTile extends QSTile<QSTile.State> {
-
- private final GlobalSetting mSetting;
-
- public BugreportTile(Host host) {
- super(host);
- mSetting = new GlobalSetting(mContext, mHandler, Global.BUGREPORT_IN_POWER_MENU) {
- @Override
- protected void handleValueChanged(int value) {
- handleRefreshState(null);
- }
- };
- }
-
- @Override
- protected State newTileState() {
- return new State();
- }
-
- @Override
- public void setListening(boolean listening) {
- mSetting.setListening(listening);
- }
-
- @Override
- protected void handleClick() {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mHost.collapsePanels();
- mUiHandler.post(mShowDialog);
- }
- });
- }
-
- @Override
- protected void handleUpdateState(State state, Object pushArg) {
- state.visible = mSetting.getValue() != 0;
- state.iconId = R.drawable.ic_qs_bugreport;
- state.label = mContext.getString(
- R.string.bugreport_tile_extended,
- mContext.getString(com.android.internal.R.string.bugreport_title),
- Build.VERSION.RELEASE,
- Build.ID);
- }
-
- private final Runnable mShowDialog = new Runnable() {
- @Override
- public void run() {
- final AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
- builder.setPositiveButton(com.android.internal.R.string.report, new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- if (which == DialogInterface.BUTTON_POSITIVE) {
- // Add a little delay before executing, to give the
- // dialog a chance to go away before it takes a
- // screenshot.
- mHandler.postDelayed(new Runnable() {
- @Override public void run() {
- try {
- ActivityManagerNative.getDefault().requestBugReport();
- } catch (RemoteException e) {
- }
- }
- }, 500);
- }
- }
- });
- builder.setMessage(com.android.internal.R.string.bugreport_message);
- builder.setTitle(com.android.internal.R.string.bugreport_title);
- builder.setCancelable(true);
- final Dialog dialog = builder.create();
- dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
- try {
- WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
- } catch (RemoteException e) {
- }
- dialog.show();
- }
- };
-}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java
index 21254d4..edb5932 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java
@@ -29,6 +29,8 @@
private final SecureSetting mSetting;
private final UsageTracker mUsageTracker;
+ private boolean mListening;
+
public ColorInversionTile(Host host) {
super(host);
@@ -36,18 +38,25 @@
Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED) {
@Override
protected void handleValueChanged(int value) {
- handleRefreshState(value);
mUsageTracker.trackUsage();
+ if (mListening) {
+ handleRefreshState(value);
+ }
}
};
mUsageTracker = new UsageTracker(host.getContext(), ColorInversionTile.class);
+ if (mSetting.getValue() != 0 && !mUsageTracker.isRecentlyUsed()) {
+ mUsageTracker.trackUsage();
+ }
mUsageTracker.setListening(true);
+ mSetting.setListening(true);
}
@Override
protected void handleDestroy() {
super.handleDestroy();
mUsageTracker.setListening(false);
+ mSetting.setListening(false);
}
@Override
@@ -57,7 +66,7 @@
@Override
public void setListening(boolean listening) {
- mSetting.setListening(listening);
+ mListening = listening;
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
index 5651d49..a8bf026 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -132,8 +132,12 @@
}
state.contentDescription = mContext.getString(
R.string.accessibility_quick_settings_wifi,
- signalContentDescription,
- state.connected ? state.label : "");
+ signalContentDescription);
+ String wifiName = state.label;
+ if (state.connected) {
+ wifiName = r.getString(R.string.accessibility_wifi_name, state.label);
+ }
+ state.dualLabelContentDescription = wifiName;
}
private static String removeDoubleQuotes(String string) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 42ae0c9..d398bc1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -36,7 +36,6 @@
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
-
import com.android.systemui.R;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.statusbar.ExpandableView;
@@ -160,6 +159,7 @@
private boolean mShadeEmpty;
private boolean mQsScrimEnabled = true;
+ private boolean mLastAnnouncementWasQuickSettings;
public NotificationPanelView(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -425,8 +425,8 @@
@Override
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
- event.getText()
- .add(getContext().getString(R.string.accessibility_desc_notification_shade));
+ event.getText().add(getKeyguardOrLockScreenString());
+ mLastAnnouncementWasQuickSettings = false;
return true;
}
@@ -987,6 +987,10 @@
setQsExpanded(true);
} else if (height <= mQsMinExpansionHeight && mQsExpanded) {
setQsExpanded(false);
+ if (mLastAnnouncementWasQuickSettings && !mTracking) {
+ announceForAccessibility(getKeyguardOrLockScreenString());
+ mLastAnnouncementWasQuickSettings = false;
+ }
}
mQsExpansionHeight = height;
mHeader.setExpansion(getHeaderExpansionFraction());
@@ -1000,6 +1004,22 @@
&& !mStackScrollerOverscrolling && mQsScrimEnabled) {
mQsNavbarScrim.setAlpha(getQsExpansionFraction());
}
+
+ // Upon initialisation when we are not layouted yet we don't want to announce that we are
+ // fully expanded, hence the != 0.0f check.
+ if (height != 0.0f && mQsFullyExpanded && !mLastAnnouncementWasQuickSettings) {
+ announceForAccessibility(getContext().getString(
+ R.string.accessibility_desc_quick_settings));
+ mLastAnnouncementWasQuickSettings = true;
+ }
+ }
+
+ private String getKeyguardOrLockScreenString() {
+ if (mStatusBarState == StatusBarState.KEYGUARD) {
+ return getContext().getString(R.string.accessibility_desc_lock_screen);
+ } else {
+ return getContext().getString(R.string.accessibility_desc_notification_shade);
+ }
}
private void updateNotificationScrim(float height) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
index 4e9f37d..15a7047 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
@@ -602,6 +602,8 @@
mPhoneSignalIconId = R.drawable.stat_sys_signal_null;
mQSPhoneSignalIconId = R.drawable.ic_qs_signal_no_signal;
mDataSignalIconId = R.drawable.stat_sys_signal_null;
+ mContentDescriptionPhoneSignal = mContext.getString(
+ AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0]);
} else {
if (mSignalStrength == null) {
if (CHATTY) Log.d(TAG, "updateTelephonySignalStrength: mSignalStrength == null");
@@ -665,8 +667,7 @@
mDataIconList = TelephonyIcons.DATA_G[mInetCondition];
mDataTypeIconId = 0;
mQSDataTypeIconId = 0;
- mContentDescriptionDataType = mContext.getString(
- R.string.accessibility_data_connection_gprs);
+ mContentDescriptionDataType = "";
break;
} else {
// fall through
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
index b05c242..51876b8 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
@@ -37,7 +37,7 @@
import android.media.ToneGenerator;
import android.media.VolumeProvider;
import android.media.session.MediaController;
-import android.media.session.MediaController.VolumeInfo;
+import android.media.session.MediaController.AudioInfo;
import android.net.Uri;
import android.os.Handler;
import android.os.Message;
@@ -537,8 +537,8 @@
if (mStreamControls != null) {
StreamControl sc = mStreamControls.get(streamType);
if (sc != null && sc.controller != null) {
- VolumeInfo vi = sc.controller.getVolumeInfo();
- return vi.getMaxVolume();
+ AudioInfo ai = sc.controller.getAudioInfo();
+ return ai.getMaxVolume();
}
}
return -1;
@@ -554,8 +554,8 @@
if (mStreamControls != null) {
StreamControl sc = mStreamControls.get(streamType);
if (sc != null && sc.controller != null) {
- VolumeInfo vi = sc.controller.getVolumeInfo();
- return vi.getCurrentVolume();
+ AudioInfo ai = sc.controller.getAudioInfo();
+ return ai.getCurrentVolume();
}
}
return -1;
@@ -990,7 +990,7 @@
// We still don't have one, ignore the command.
Log.w(mTag, "sent remote volume change without a controller!");
} else {
- VolumeInfo vi = controller.getVolumeInfo();
+ AudioInfo vi = controller.getAudioInfo();
index = vi.getCurrentVolume();
max = vi.getMaxVolume();
if ((vi.getVolumeControl() & VolumeProvider.VOLUME_CONTROL_FIXED) != 0) {
@@ -1362,7 +1362,7 @@
};
private final MediaController.Callback mMediaControllerCb = new MediaController.Callback() {
- public void onVolumeInfoChanged(VolumeInfo info) {
+ public void onAudioInfoChanged(AudioInfo info) {
onRemoteVolumeUpdateIfShown();
}
};
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 964acbd..73358c8 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -3559,6 +3559,10 @@
if (transitionId != -1 && transitionId != R.transition.no_transition) {
TransitionInflater inflater = TransitionInflater.from(getContext());
transition = inflater.inflateTransition(transitionId);
+ if (transition instanceof TransitionSet &&
+ ((TransitionSet)transition).getTransitionCount() == 0) {
+ transition = null;
+ }
}
return transition;
}
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index c44474d..5900612 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -871,6 +871,7 @@
BackupManagerService.this, mActiveRestoreSession));
}
}
+ break;
}
case MSG_FULL_CONFIRMATION_TIMEOUT:
@@ -7538,6 +7539,9 @@
}
}
+ // Clear any ongoing session timeout.
+ mBackupHandler.removeMessages(MSG_RESTORE_TIMEOUT);
+
// If we have a PM token, we must under all circumstances be sure to
// handshake when we've finished.
if (mPmToken > 0) {
@@ -7545,6 +7549,11 @@
try {
mPackageManagerBinder.finishPackageInstall(mPmToken);
} catch (RemoteException e) { /* can't happen */ }
+ } else {
+ // We were invoked via an active restore session, not by the Package
+ // Manager, so start up the session timeout again.
+ mBackupHandler.sendEmptyMessageDelayed(MSG_RESTORE_TIMEOUT,
+ TIMEOUT_RESTORE_INTERVAL);
}
// Kick off any work that may be needed regarding app widget restores
@@ -7558,11 +7567,6 @@
writeRestoreTokens();
}
- // Furthermore we need to reset the session timeout clock
- mBackupHandler.removeMessages(MSG_RESTORE_TIMEOUT);
- mBackupHandler.sendEmptyMessageDelayed(MSG_RESTORE_TIMEOUT,
- TIMEOUT_RESTORE_INTERVAL);
-
// done; we can finally release the wakelock and be legitimately done.
Slog.i(TAG, "Restore complete.");
mWakelock.release();
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index e0f9b9c..2e7b745 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -66,6 +66,7 @@
import android.content.res.TypedArray;
import android.database.ContentObserver;
import android.inputmethodservice.InputMethodService;
+import android.net.Uri;
import android.os.Binder;
import android.os.Environment;
import android.os.Handler;
@@ -392,6 +393,7 @@
private InputMethodInfo[] mIms;
private int[] mSubtypeIds;
private Locale mLastSystemLocale;
+ private boolean mShowImeWithHardKeyboard;
private final MyPackageMonitor mMyPackageMonitor = new MyPackageMonitor();
private final IPackageManager mIPackageManager;
@@ -407,17 +409,25 @@
Settings.Secure.ENABLED_INPUT_METHODS), false, this);
resolver.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE), false, this);
+ resolver.registerContentObserver(Settings.Secure.getUriFor(
+ Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD), false, this);
}
- @Override public void onChange(boolean selfChange) {
+ @Override public void onChange(boolean selfChange, Uri uri) {
+ final Uri showImeUri =
+ Settings.Secure.getUriFor(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD);
synchronized (mMethodMap) {
- boolean enabledChanged = false;
- String newEnabled = mSettings.getEnabledInputMethodsStr();
- if (!mLastEnabled.equals(newEnabled)) {
- mLastEnabled = newEnabled;
- enabledChanged = true;
+ if (showImeUri.equals(uri)) {
+ updateKeyboardFromSettingsLocked();
+ } else {
+ boolean enabledChanged = false;
+ String newEnabled = mSettings.getEnabledInputMethodsStr();
+ if (!mLastEnabled.equals(newEnabled)) {
+ mLastEnabled = newEnabled;
+ enabledChanged = true;
+ }
+ updateInputMethodsFromSettingsLocked(enabledChanged);
}
- updateFromSettingsLocked(enabledChanged);
}
}
}
@@ -598,16 +608,14 @@
private class HardKeyboardListener
implements WindowManagerService.OnHardKeyboardStatusChangeListener {
@Override
- public void onHardKeyboardStatusChange(boolean available, boolean enabled) {
- mHandler.sendMessage(mHandler.obtainMessage(
- MSG_HARD_KEYBOARD_SWITCH_CHANGED, available ? 1 : 0, enabled ? 1 : 0));
+ public void onHardKeyboardStatusChange(boolean available) {
+ mHandler.sendMessage(mHandler.obtainMessage(MSG_HARD_KEYBOARD_SWITCH_CHANGED,
+ available ? 1 : 0));
}
- public void handleHardKeyboardStatusChange(boolean available,
- boolean showImeWithHardKeyboard) {
+ public void handleHardKeyboardStatusChange(boolean available) {
if (DEBUG) {
- Slog.w(TAG, "HardKeyboardStatusChanged: available = " + available
- + ", showImeWithHardKeyboard= " + showImeWithHardKeyboard);
+ Slog.w(TAG, "HardKeyboardStatusChanged: available=" + available);
}
synchronized(mMethodMap) {
if (mSwitchingDialog != null && mSwitchingDialogTitleView != null
@@ -1657,6 +1665,11 @@
}
void updateFromSettingsLocked(boolean enabledMayChange) {
+ updateInputMethodsFromSettingsLocked(enabledMayChange);
+ updateKeyboardFromSettingsLocked();
+ }
+
+ void updateInputMethodsFromSettingsLocked(boolean enabledMayChange) {
if (enabledMayChange) {
List<InputMethodInfo> enabled = mSettings.getEnabledInputMethodListLocked();
for (int i=0; i<enabled.size(); i++) {
@@ -1710,6 +1723,18 @@
// TODO: Make sure that mSwitchingController and mSettings are sharing the
// the same enabled IMEs list.
mSwitchingController.resetCircularListLocked(mContext);
+
+ }
+
+ public void updateKeyboardFromSettingsLocked() {
+ mShowImeWithHardKeyboard = mSettings.isShowImeWithHardKeyboardEnabled();
+ if (mSwitchingDialog != null
+ && mSwitchingDialogTitleView != null
+ && mSwitchingDialog.isShowing()) {
+ final Switch hardKeySwitch = (Switch)mSwitchingDialogTitleView.findViewById(
+ com.android.internal.R.id.hard_keyboard_switch);
+ hardKeySwitch.setChecked(mShowImeWithHardKeyboard);
+ }
}
/* package */ void setInputMethodLocked(String id, int subtypeId) {
@@ -2594,8 +2619,7 @@
// --------------------------------------------------------------
case MSG_HARD_KEYBOARD_SWITCH_CHANGED:
- mHardKeyboardListener.handleHardKeyboardStatusChange(
- msg.arg1 == 1, msg.arg2 == 1);
+ mHardKeyboardListener.handleHardKeyboardStatusChange(msg.arg1 == 1);
return true;
}
return false;
@@ -2684,7 +2708,7 @@
if (!map.containsKey(defaultImiId)) {
Slog.w(TAG, "Default IME is uninstalled. Choose new default IME.");
if (chooseNewDefaultIMELocked()) {
- updateFromSettingsLocked(true);
+ updateInputMethodsFromSettingsLocked(true);
}
} else {
// Double check that the default IME is certainly enabled.
@@ -2811,11 +2835,11 @@
? View.VISIBLE : View.GONE);
final Switch hardKeySwitch = (Switch)mSwitchingDialogTitleView.findViewById(
com.android.internal.R.id.hard_keyboard_switch);
- hardKeySwitch.setChecked(mWindowManagerService.isShowImeWithHardKeyboardEnabled());
+ hardKeySwitch.setChecked(mShowImeWithHardKeyboard);
hardKeySwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- mWindowManagerService.setShowImeWithHardKeyboard(isChecked);
+ mSettings.setShowImeWithHardKeyboard(isChecked);
// Ensure that the input method dialog is dismissed when changing
// the hardware keyboard state.
hideInputMethodMenu();
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index ecd8f11..9162b3d 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3434,6 +3434,70 @@
}
@Override
+ public final int startActivityAsCaller(IApplicationThread caller, String callingPackage,
+ Intent intent, String resolvedType, IBinder resultTo,
+ String resultWho, int requestCode, int startFlags,
+ String profileFile, ParcelFileDescriptor profileFd, Bundle options) {
+
+ // This is very dangerous -- it allows you to perform a start activity (including
+ // permission grants) as any app that may launch one of your own activities. So
+ // we will only allow this to be done from activities that are part of the core framework,
+ // and then only when they are running as the system.
+ final ActivityRecord sourceRecord;
+ final int targetUid;
+ final String targetPackage;
+ synchronized (this) {
+ if (resultTo == null) {
+ throw new SecurityException("Must be called from an activity");
+ }
+ sourceRecord = mStackSupervisor.isInAnyStackLocked(resultTo);
+ if (sourceRecord == null) {
+ throw new SecurityException("Called with bad activity token: " + resultTo);
+ }
+ if (!sourceRecord.info.packageName.equals("android")) {
+ throw new SecurityException(
+ "Must be called from an activity that is declared in the android package");
+ }
+ if (sourceRecord.app == null) {
+ throw new SecurityException("Called without a process attached to activity");
+ }
+ if (sourceRecord.app.uid != Process.SYSTEM_UID) {
+ // This is still okay, as long as this activity is running under the
+ // uid of the original calling activity.
+ if (sourceRecord.app.uid != sourceRecord.launchedFromUid) {
+ throw new SecurityException(
+ "Calling activity in uid " + sourceRecord.app.uid
+ + " must be system uid or original calling uid "
+ + sourceRecord.launchedFromUid);
+ }
+ }
+ targetUid = sourceRecord.launchedFromUid;
+ targetPackage = sourceRecord.launchedFromPackage;
+ }
+
+ // TODO: Switch to user app stacks here.
+ try {
+ int ret = mStackSupervisor.startActivityMayWait(null, targetUid, targetPackage, intent,
+ resolvedType, null, null, resultTo, resultWho, requestCode, startFlags,
+ null, null, null, null, options, UserHandle.getUserId(targetUid), null);
+ return ret;
+ } catch (SecurityException e) {
+ // XXX need to figure out how to propagate to original app.
+ // A SecurityException here is generally actually a fault of the original
+ // calling activity (such as a fairly granting permissions), so propagate it
+ // back to them.
+ /*
+ StringBuilder msg = new StringBuilder();
+ msg.append("While launching");
+ msg.append(intent.toString());
+ msg.append(": ");
+ msg.append(e.getMessage());
+ */
+ throw e;
+ }
+ }
+
+ @Override
public final WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,
Intent intent, String resolvedType, IBinder resultTo,
String resultWho, int requestCode, int startFlags, String profileFile,
@@ -11402,6 +11466,7 @@
pw.println(" [-a] [-c] [-h] [cmd] ...");
pw.println(" cmd may be one of:");
pw.println(" a[ctivities]: activity stack state");
+ pw.println(" r[recents]: recent activities state");
pw.println(" b[roadcasts] [PACKAGE_NAME] [history [-s]]: broadcast state");
pw.println(" i[ntents] [PACKAGE_NAME]: pending intent state");
pw.println(" p[rocesses] [PACKAGE_NAME]: process state");
@@ -11435,6 +11500,10 @@
synchronized (this) {
dumpActivitiesLocked(fd, pw, args, opti, true, dumpClient, null);
}
+ } else if ("recents".equals(cmd) || "r".equals(cmd)) {
+ synchronized (this) {
+ dumpRecentsLocked(fd, pw, args, opti, true, null);
+ }
} else if ("broadcasts".equals(cmd) || "b".equals(cmd)) {
String[] newArgs;
String name;
@@ -11578,6 +11647,11 @@
if (dumpAll) {
pw.println("-------------------------------------------------------------------------------");
}
+ dumpRecentsLocked(fd, pw, args, opti, dumpAll, dumpPackage);
+ pw.println();
+ if (dumpAll) {
+ pw.println("-------------------------------------------------------------------------------");
+ }
dumpActivitiesLocked(fd, pw, args, opti, dumpAll, dumpClient, dumpPackage);
pw.println();
if (dumpAll) {
@@ -11612,6 +11686,17 @@
mStackSupervisor.dump(pw, " ");
}
+ if (!printedAnything) {
+ pw.println(" (nothing)");
+ }
+ }
+
+ void dumpRecentsLocked(FileDescriptor fd, PrintWriter pw, String[] args,
+ int opti, boolean dumpAll, String dumpPackage) {
+ pw.println("ACTIVITY MANAGER RECENT ACTIVITIES (dumpsys activity recents)");
+
+ boolean printedAnything = false;
+
if (mRecentTasks.size() > 0) {
boolean printedHeader = false;
@@ -11625,9 +11710,6 @@
}
}
if (!printedHeader) {
- if (needSep) {
- pw.println();
- }
pw.println(" Recent tasks:");
printedHeader = true;
printedAnything = true;
diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java
index 4c887dd..0dc163b 100644
--- a/services/core/java/com/android/server/am/CoreSettingsObserver.java
+++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java
@@ -41,12 +41,17 @@
String, Class<?>>();
private static final Map<String, Class<?>> sSystemSettingToTypeMap = new HashMap<
String, Class<?>>();
+ private static final Map<String, Class<?>> sGlobalSettingToTypeMap = new HashMap<
+ String, Class<?>>();
static {
sSecureSettingToTypeMap.put(Settings.Secure.LONG_PRESS_TIMEOUT, int.class);
// add other secure settings here...
sSystemSettingToTypeMap.put(Settings.System.TIME_12_24, String.class);
// add other system settings here...
+
+ sGlobalSettingToTypeMap.put(Settings.Global.DEBUG_VIEW_ATTRIBUTES, int.class);
+ // add other global settings here...
}
private final Bundle mCoreSettings = new Bundle();
@@ -74,6 +79,7 @@
private void sendCoreSettings() {
populateSettings(mCoreSettings, sSecureSettingToTypeMap);
populateSettings(mCoreSettings, sSystemSettingToTypeMap);
+ populateSettings(mCoreSettings, sGlobalSettingToTypeMap);
mActivityManagerService.onCoreSettingsChange(mCoreSettings);
}
@@ -89,6 +95,12 @@
mActivityManagerService.mContext.getContentResolver().registerContentObserver(
uri, false, this);
}
+
+ for (String setting : sGlobalSettingToTypeMap.keySet()) {
+ Uri uri = Settings.Global.getUriFor(setting);
+ mActivityManagerService.mContext.getContentResolver().registerContentObserver(
+ uri, false, this);
+ }
}
private void populateSettings(Bundle snapshot, Map<String, Class<?>> map) {
@@ -101,32 +113,40 @@
final String value;
if (map == sSecureSettingToTypeMap) {
value = Settings.Secure.getString(context.getContentResolver(), setting);
- } else {
+ } else if (map == sSystemSettingToTypeMap) {
value = Settings.System.getString(context.getContentResolver(), setting);
+ } else {
+ value = Settings.Global.getString(context.getContentResolver(), setting);
}
snapshot.putString(setting, value);
} else if (type == int.class) {
final int value;
if (map == sSecureSettingToTypeMap) {
value = Settings.Secure.getInt(context.getContentResolver(), setting);
- } else {
+ } else if (map == sSystemSettingToTypeMap) {
value = Settings.System.getInt(context.getContentResolver(), setting);
+ } else {
+ value = Settings.Global.getInt(context.getContentResolver(), setting);
}
snapshot.putInt(setting, value);
} else if (type == float.class) {
final float value;
if (map == sSecureSettingToTypeMap) {
value = Settings.Secure.getFloat(context.getContentResolver(), setting);
- } else {
+ } else if (map == sSystemSettingToTypeMap) {
value = Settings.System.getFloat(context.getContentResolver(), setting);
+ } else {
+ value = Settings.Global.getFloat(context.getContentResolver(), setting);
}
snapshot.putFloat(setting, value);
} else if (type == long.class) {
final long value;
if (map == sSecureSettingToTypeMap) {
value = Settings.Secure.getLong(context.getContentResolver(), setting);
- } else {
+ } else if (map == sSystemSettingToTypeMap) {
value = Settings.System.getLong(context.getContentResolver(), setting);
+ } else {
+ value = Settings.Global.getLong(context.getContentResolver(), setting);
}
snapshot.putLong(setting, value);
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
index 46b2b3e..aed5dcc 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
@@ -155,7 +155,7 @@
}
/**
- * A mapping between andorid and cec keycode.
+ * A mapping between Android and CEC keycode.
*
* <p>Normal implementation of this looks like
* <pre>
@@ -174,43 +174,28 @@
private static class KeycodeEntry {
private final int mAndroidKeycode;
private final int mCecKeycode;
- private final int mParam;
private final boolean mIsRepeatable;
- private KeycodeEntry(int androidKeycode, int cecKeycode, int param, boolean isRepeatable) {
+ private KeycodeEntry(int androidKeycode, int cecKeycode, boolean isRepeatable) {
mAndroidKeycode = androidKeycode;
mCecKeycode = cecKeycode;
- mParam = param;
mIsRepeatable = isRepeatable;
}
private KeycodeEntry(int androidKeycode, int cecKeycode) {
- this(androidKeycode, cecKeycode, NO_PARAM, true);
+ this(androidKeycode, cecKeycode, true);
}
- private KeycodeEntry(int androidKeycode, int cecKeycode, boolean isRepeatable) {
- this(androidKeycode, cecKeycode, NO_PARAM, isRepeatable);
- }
-
- private byte[] toCecKeycodeIfMatched(int androidKeycode) {
+ private int toCecKeycodeIfMatched(int androidKeycode) {
if (mAndroidKeycode == androidKeycode) {
- if (mParam == NO_PARAM) {
- return new byte[] {
- (byte) (mCecKeycode & 0xFF)
- };
- } else {
- return new byte[] {
- (byte) (mCecKeycode & 0xFF),
- (byte) (mParam & 0xFF)
- };
- }
+ return mCecKeycode;
} else {
- return null;
+ return UNSUPPORTED_KEYCODE;
}
}
- private int toAndroidKeycodeIfMatched(int cecKeycode, int param) {
- if (cecKeycode == mCecKeycode && mParam == param) {
+ private int toAndroidKeycodeIfMatched(int cecKeycode) {
+ if (cecKeycode == mCecKeycode) {
return mAndroidKeycode;
} else {
return UNSUPPORTED_KEYCODE;
@@ -365,29 +350,28 @@
* Translate Android keycode to Hdmi Cec keycode.
*
* @param keycode Android keycode. For details, refer {@link KeyEvent}
- * @return array of byte which contains cec keycode and param if it has;
- * return null if failed to find matched cec keycode
+ * @return single byte CEC keycode if matched.
*/
- static byte[] androidKeyToCecKey(int keycode) {
+ static int androidKeyToCecKey(int keycode) {
for (int i = 0; i < KEYCODE_ENTRIES.length; ++i) {
- byte[] cecKeycode = KEYCODE_ENTRIES[i].toCecKeycodeIfMatched(keycode);
- if (cecKeycode != null) {
+ int cecKeycode = KEYCODE_ENTRIES[i].toCecKeycodeIfMatched(keycode);
+ if (cecKeycode != UNSUPPORTED_KEYCODE) {
return cecKeycode;
}
}
- return null;
+ return UNSUPPORTED_KEYCODE;
}
/**
* Translate Hdmi CEC keycode to Android keycode.
*
- * @param keycode Cec keycode. If has no param, put {@link #NO_PARAM}
+ * @param keycode CEC keycode
* @return cec keycode corresponding to the given android keycode.
* If finds no matched keycode, return {@link #UNSUPPORTED_KEYCODE}
*/
- static int cecKeyToAndroidKey(int keycode, int param) {
+ static int cecKeyToAndroidKey(int keycode) {
for (int i = 0; i < KEYCODE_ENTRIES.length; ++i) {
- int androidKey = KEYCODE_ENTRIES[i].toAndroidKeycodeIfMatched(keycode, param);
+ int androidKey = KEYCODE_ENTRIES[i].toAndroidKeycodeIfMatched(keycode);
if (androidKey != UNSUPPORTED_KEYCODE) {
return androidKey;
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
index 4862f93..b43ad1b 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
@@ -405,8 +405,9 @@
final long downTime = SystemClock.uptimeMillis();
final byte[] params = message.getParams();
- final int keycode = HdmiCecKeycode.cecKeyToAndroidKey(params[0],
- params.length > 1 ? params[1] : HdmiCecKeycode.NO_PARAM);
+ // Note that we don't support parameterized keycode now.
+ // TODO: translate parameterized keycode as well.
+ final int keycode = HdmiCecKeycode.cecKeyToAndroidKey(params[0]);
int keyRepeatCount = 0;
if (mLastKeycode != HdmiCecKeycode.UNSUPPORTED_KEYCODE) {
if (keycode == mLastKeycode) {
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 809fef4..126a56d 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1007,10 +1007,8 @@
/**
* Return external input devices.
*/
- List<HdmiDeviceInfo> getSafeExternalInputs() {
- synchronized (mLock) {
- return mSafeExternalInputs;
- }
+ List<HdmiDeviceInfo> getSafeExternalInputsLocked() {
+ return mSafeExternalInputs;
}
@ServiceThreadOnly
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 14c066e..32d97ba 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -16,6 +16,8 @@
package com.android.server.hdmi;
+import static android.hardware.hdmi.HdmiControlManager.DEVICE_EVENT_ADD_DEVICE;
+import static android.hardware.hdmi.HdmiControlManager.DEVICE_EVENT_REMOVE_DEVICE;
import static com.android.server.hdmi.Constants.DISABLED;
import static com.android.server.hdmi.Constants.ENABLED;
import static com.android.server.hdmi.Constants.OPTION_CEC_AUTO_WAKEUP;
@@ -202,6 +204,9 @@
@GuardedBy("mLock")
private boolean mMhlInputChangeEnabled;
+ @GuardedBy("mLock")
+ private List<HdmiDeviceInfo> mMhlDevices;
+
// List of listeners registered by callers that want to get notified of
// system audio mode changes.
private final ArrayList<IHdmiSystemAudioModeChangeListener>
@@ -293,6 +298,7 @@
Slog.i(TAG, "Device does not support MHL-control.");
}
initPortInfo();
+ mMhlDevices = Collections.emptyList();
mMessageValidator = new HdmiCecMessageValidator(this);
publishBinderService(Context.HDMI_CONTROL_SERVICE, new BinderService());
@@ -320,7 +326,6 @@
}
}
-
private void registerContentObserver() {
ContentResolver resolver = getContext().getContentResolver();
String[] settings = new String[] {
@@ -330,7 +335,7 @@
Global.MHL_INPUT_SWITCHING_ENABLED,
Global.MHL_POWER_CHARGE_ENABLED
};
- for (String s: settings) {
+ for (String s : settings) {
resolver.registerContentObserver(Global.getUriFor(s), false, mSettingsObserver,
UserHandle.USER_ALL);
}
@@ -684,16 +689,16 @@
/**
* Called when a new hotplug event is issued.
*
- * @param portNo hdmi port number where hot plug event issued.
+ * @param portId hdmi port number where hot plug event issued.
* @param connected whether to be plugged in or not
*/
@ServiceThreadOnly
- void onHotplug(int portNo, boolean connected) {
+ void onHotplug(int portId, boolean connected) {
assertRunOnServiceThread();
for (HdmiCecLocalDevice device : mCecController.getLocalDeviceList()) {
- device.onHotplug(portNo, connected);
+ device.onHotplug(portId, connected);
}
- announceHotplugEvent(portNo, connected);
+ announceHotplugEvent(portId, connected);
}
/**
@@ -794,10 +799,15 @@
HdmiMhlLocalDevice device = mMhlController.removeLocalDevice(portId);
if (device != null) {
device.onDeviceRemoved();
+ // There is no explicit event for device removal unlike capability register event
+ // used for device addition . Hence we remove the device on hotplug event.
+ invokeDeviceEventListeners(device.getInfo(), DEVICE_EVENT_REMOVE_DEVICE);
+ updateSafeMhlInput();
} else {
Slog.w(TAG, "No device to remove:[portId=" + portId);
}
}
+ announceHotplugEvent(portId, connected);
}
@ServiceThreadOnly
@@ -824,18 +834,45 @@
}
@ServiceThreadOnly
- void handleCapabilityRegisterChanged(int portId, int adopterId, int deviceId) {
+ void handleMhlCapabilityRegisterChanged(int portId, int adopterId, int deviceId) {
assertRunOnServiceThread();
HdmiMhlLocalDevice device = mMhlController.getLocalDevice(portId);
- // Hot plug event should be called before capability register change event.
+
+ // Hotplug event should already have been called before capability register change event.
if (device != null) {
device.setCapabilityRegister(adopterId, deviceId);
+ invokeDeviceEventListeners(device.getInfo(), DEVICE_EVENT_ADD_DEVICE);
+ updateSafeMhlInput();
} else {
Slog.w(TAG, "No mhl device exists for capability register change event[portId:"
+ portId + ", adopterId:" + adopterId + ", deviceId:" + deviceId + "]");
}
}
+ @ServiceThreadOnly
+ private void updateSafeMhlInput() {
+ assertRunOnServiceThread();
+ List<HdmiDeviceInfo> inputs = Collections.emptyList();
+ SparseArray<HdmiMhlLocalDevice> devices = mMhlController.getAllLocalDevices();
+ for (int i = 0; i < devices.size(); ++i) {
+ HdmiMhlLocalDevice device = devices.valueAt(i);
+ HdmiDeviceInfo info = device.getInfo();
+ if (info != null) {
+ if (inputs.isEmpty()) {
+ inputs = new ArrayList<>();
+ }
+ inputs.add(device.getInfo());
+ }
+ }
+ synchronized (mLock) {
+ mMhlDevices = inputs;
+ }
+ }
+
+ private List<HdmiDeviceInfo> getMhlDevicesLocked() {
+ return mMhlDevices;
+ }
+
// Record class that monitors the event of the caller of being killed. Used to clean up
// the listener list and record list accordingly.
private final class HotplugEventListenerRecord implements IBinder.DeathRecipient {
@@ -1139,10 +1176,12 @@
// No need to hold the lock for obtaining TV device as the local device instance
// is preserved while the HDMI control is enabled.
HdmiCecLocalDeviceTv tv = tv();
- if (tv == null) {
- return Collections.emptyList();
+ synchronized (mLock) {
+ List<HdmiDeviceInfo> cecDevices = (tv == null)
+ ? Collections.<HdmiDeviceInfo>emptyList()
+ : tv.getSafeExternalInputsLocked();
+ return HdmiUtils.mergeToUnmodifiableList(cecDevices, getMhlDevicesLocked());
}
- return tv.getSafeExternalInputs();
}
@Override
diff --git a/services/core/java/com/android/server/hdmi/HdmiUtils.java b/services/core/java/com/android/server/hdmi/HdmiUtils.java
index 23f19ff..22a519b 100644
--- a/services/core/java/com/android/server/hdmi/HdmiUtils.java
+++ b/services/core/java/com/android/server/hdmi/HdmiUtils.java
@@ -206,6 +206,22 @@
return list;
}
+ static <T> List<T> mergeToUnmodifiableList(List<T> a, List<T> b) {
+ if (a.isEmpty() && b.isEmpty()) {
+ return Collections.emptyList();
+ }
+ if (a.isEmpty()) {
+ return Collections.unmodifiableList(b);
+ }
+ if (b.isEmpty()) {
+ return Collections.unmodifiableList(a);
+ }
+ List<T> newList = new ArrayList<>();
+ newList.addAll(a);
+ newList.addAll(b);
+ return Collections.unmodifiableList(newList);
+ }
+
/**
* See if the new path is affecting the active path.
*
diff --git a/services/core/java/com/android/server/hdmi/SendKeyAction.java b/services/core/java/com/android/server/hdmi/SendKeyAction.java
index 9f09eb4..ed978e0 100644
--- a/services/core/java/com/android/server/hdmi/SendKeyAction.java
+++ b/services/core/java/com/android/server/hdmi/SendKeyAction.java
@@ -109,12 +109,12 @@
}
private void sendKeyDown(int keycode) {
- byte[] keycodeAndParam = getCecKeycodeAndParam(keycode);
- if (keycodeAndParam == null) {
+ int cecKeycode = HdmiCecKeycode.androidKeyToCecKey(keycode);
+ if (cecKeycode == HdmiCecKeycode.UNSUPPORTED_KEYCODE) {
return;
}
sendCommand(HdmiCecMessageBuilder.buildUserControlPressed(getSourceAddress(),
- mTargetAddress, keycodeAndParam));
+ mTargetAddress, new byte[] { (byte) (cecKeycode & 0xFF) }));
}
private void sendKeyUp() {
@@ -141,13 +141,4 @@
sendKeyDown(mLastKeycode);
addTimer(mState, IRT_MS);
}
-
- // Converts the Android key code to corresponding CEC key code definition. Those CEC keys
- // with additional parameters should be mapped from individual Android key code. 'Select
- // Broadcast' with the parameter 'cable', for instance, shall have its counterpart such as
- // KeyEvent.KEYCODE_TV_BROADCAST_CABLE.
- // The return byte array contains both UI command (keycode) and optional parameter.
- private byte[] getCecKeycodeAndParam(int keycode) {
- return HdmiCecKeycode.androidKeyToCecKey(keycode);
- }
}
diff --git a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
index 289b5aa..69d1dc9 100644
--- a/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
+++ b/services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java
@@ -26,6 +26,8 @@
import android.media.projection.IMediaProjectionManager;
import android.media.projection.IMediaProjection;
import android.media.projection.IMediaProjectionCallback;
+import android.media.projection.IMediaProjectionWatcherCallback;
+import android.media.projection.MediaProjectionInfo;
import android.media.projection.MediaProjectionManager;
import android.os.Binder;
import android.os.Handler;
@@ -34,6 +36,7 @@
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
+import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.Slog;
@@ -59,15 +62,20 @@
private static final String TAG = "MediaProjectionManagerService";
private final Object mLock = new Object(); // Protects the list of media projections
- private final Map<IBinder, MediaProjection> mProjectionGrants;
+ private final Map<IBinder, IBinder.DeathRecipient> mDeathEaters;
+ private final CallbackDelegate mCallbackDelegate;
private final Context mContext;
private final AppOpsManager mAppOps;
+ private IBinder mProjectionToken;
+ private MediaProjection mProjectionGrant;
+
public MediaProjectionManagerService(Context context) {
super(context);
mContext = context;
- mProjectionGrants = new ArrayMap<IBinder, MediaProjection>();
+ mDeathEaters = new ArrayMap<IBinder, IBinder.DeathRecipient>();
+ mCallbackDelegate = new CallbackDelegate();
mAppOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
Watchdog.getInstance().addMonitor(this);
}
@@ -83,13 +91,97 @@
synchronized (mLock) { /* check for deadlock */ }
}
+ private void startProjectionLocked(final MediaProjection projection) {
+ if (mProjectionGrant != null) {
+ mProjectionGrant.stop();
+ }
+ mProjectionToken = projection.asBinder();
+ mProjectionGrant = projection;
+ dispatchStart(projection);
+ }
+
+ private void stopProjectionLocked(final MediaProjection projection) {
+ mProjectionToken = null;
+ mProjectionGrant = null;
+ dispatchStop(projection);
+ }
+
+ private void addCallback(final IMediaProjectionWatcherCallback callback) {
+ IBinder.DeathRecipient deathRecipient = new IBinder.DeathRecipient() {
+ @Override
+ public void binderDied() {
+ synchronized (mLock) {
+ unlinkDeathRecipientLocked(callback);
+ removeCallback(callback);
+ }
+ }
+ };
+ synchronized (mLock) {
+ mCallbackDelegate.add(callback);
+ linkDeathRecipientLocked(callback, deathRecipient);
+ }
+ }
+
+ private void removeCallback(IMediaProjectionWatcherCallback callback) {
+ synchronized (mLock) {
+ unlinkDeathRecipientLocked(callback);
+ removeCallback(callback);
+ }
+ }
+
+ private void linkDeathRecipientLocked(IMediaProjectionWatcherCallback callback,
+ IBinder.DeathRecipient deathRecipient) {
+ try {
+ final IBinder token = callback.asBinder();
+ token.linkToDeath(deathRecipient, 0);
+ mDeathEaters.put(token, deathRecipient);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "Unable to link to death for media projection monitoring callback", e);
+ }
+ }
+
+ private void unlinkDeathRecipientLocked(IMediaProjectionWatcherCallback callback) {
+ final IBinder token = callback.asBinder();
+ IBinder.DeathRecipient deathRecipient = mDeathEaters.remove(token);
+ if (deathRecipient != null) {
+ token.unlinkToDeath(deathRecipient, 0);
+ }
+ }
+
+ private void dispatchStart(MediaProjection projection) {
+ mCallbackDelegate.dispatchStart(projection);
+ }
+
+ private void dispatchStop(MediaProjection projection) {
+ mCallbackDelegate.dispatchStop(projection);
+ }
+
+ private boolean isValidMediaProjection(IBinder token) {
+ synchronized (mLock) {
+ if (mProjectionToken != null) {
+ return mProjectionToken.equals(token);
+ }
+ return false;
+ }
+ }
+
+ private MediaProjectionInfo getActiveProjectionInfo() {
+ synchronized (mLock) {
+ if (mProjectionGrant == null) {
+ return null;
+ }
+ return mProjectionGrant.getProjectionInfo();
+ }
+ }
+
private void dump(final PrintWriter pw) {
pw.println("MEDIA PROJECTION MANAGER (dumpsys media_projection)");
synchronized (mLock) {
- Collection<MediaProjection> projections = mProjectionGrants.values();
- pw.println("Media Projections: size=" + projections.size());
- for (MediaProjection mp : projections) {
- mp.dump(pw, " ");
+ pw.println("Media Projection: ");
+ if (mProjectionGrant != null ) {
+ mProjectionGrant.dump(pw);
+ } else {
+ pw.println("null");
}
}
}
@@ -115,11 +207,14 @@
@Override // Binder call
public IMediaProjection createProjection(int uid, String packageName, int type,
boolean isPermanentGrant) {
- if (mContext.checkCallingPermission(Manifest.permission.CREATE_MEDIA_PROJECTION)
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
!= PackageManager.PERMISSION_GRANTED) {
- throw new SecurityException("Requires CREATE_MEDIA_PROJECTION in order to grant "
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to grant "
+ "projection permission");
}
+ if (packageName == null || packageName.isEmpty()) {
+ throw new IllegalArgumentException("package name must not be empty");
+ }
long callingToken = Binder.clearCallingIdentity();
MediaProjection projection;
try {
@@ -136,7 +231,71 @@
@Override // Binder call
public boolean isValidMediaProjection(IMediaProjection projection) {
- return mProjectionGrants.containsKey(projection.asBinder());
+ return MediaProjectionManagerService.this.isValidMediaProjection(
+ projection.asBinder());
+ }
+
+ @Override // Binder call
+ public MediaProjectionInfo getActiveProjectionInfo() {
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to add "
+ + "projection callbacks");
+ }
+ final long token = Binder.clearCallingIdentity();
+ try {
+ return MediaProjectionManagerService.this.getActiveProjectionInfo();
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
+ @Override // Binder call
+ public void stopActiveProjection() {
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to add "
+ + "projection callbacks");
+ }
+ final long token = Binder.clearCallingIdentity();
+ try {
+ if (mProjectionGrant != null) {
+ mProjectionGrant.stop();
+ }
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+
+ }
+
+ @Override //Binder call
+ public void addCallback(final IMediaProjectionWatcherCallback callback) {
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to add "
+ + "projection callbacks");
+ }
+ final long token = Binder.clearCallingIdentity();
+ try {
+ MediaProjectionManagerService.this.addCallback(callback);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
+ @Override
+ public void removeCallback(IMediaProjectionWatcherCallback callback) {
+ if (mContext.checkCallingPermission(Manifest.permission.MANAGE_MEDIA_PROJECTION)
+ != PackageManager.PERMISSION_GRANTED) {
+ throw new SecurityException("Requires MANAGE_MEDIA_PROJECTION in order to remove "
+ + "projection callbacks");
+ }
+ final long token = Binder.clearCallingIdentity();
+ try {
+ MediaProjectionManagerService.this.removeCallback(callback);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
}
@Override // Binder call
@@ -157,25 +316,27 @@
}
}
+
private boolean checkPermission(String packageName, String permission) {
return mContext.getPackageManager().checkPermission(permission, packageName)
== PackageManager.PERMISSION_GRANTED;
}
}
- private final class MediaProjection extends IMediaProjection.Stub implements DeathRecipient {
- public int uid;
- public String packageName;
+ private final class MediaProjection extends IMediaProjection.Stub {
+ public final int uid;
+ public final String packageName;
+ public final UserHandle userHandle;
private IBinder mToken;
+ private IBinder.DeathRecipient mDeathEater;
private int mType;
- private CallbackDelegate mCallbackDelegate;
public MediaProjection(int type, int uid, String packageName) {
mType = type;
this.uid = uid;
this.packageName = packageName;
- mCallbackDelegate = new CallbackDelegate();
+ userHandle = new UserHandle(UserHandle.getUserId(uid));
}
@Override // Binder call
@@ -220,49 +381,50 @@
}
@Override // Binder call
- public void start(IMediaProjectionCallback callback) {
+ public void start(final IMediaProjectionCallback callback) {
if (callback == null) {
throw new IllegalArgumentException("callback must not be null");
}
synchronized (mLock) {
- if (mProjectionGrants.containsKey(asBinder())) {
+ if (isValidMediaProjection(asBinder())) {
throw new IllegalStateException(
"Cannot start already started MediaProjection");
}
addCallback(callback);
try {
mToken = callback.asBinder();
- mToken.linkToDeath(this, 0);
+ mDeathEater = new IBinder.DeathRecipient() {
+ @Override
+ public void binderDied() {
+ mCallbackDelegate.remove(callback);
+ stop();
+ }
+ };
+ mToken.linkToDeath(mDeathEater, 0);
} catch (RemoteException e) {
Slog.w(TAG,
"MediaProjectionCallbacks must be valid, aborting MediaProjection", e);
return;
}
- mProjectionGrants.put(asBinder(), this);
+ startProjectionLocked(this);
}
}
@Override // Binder call
public void stop() {
synchronized (mLock) {
- if (!mProjectionGrants.containsKey(asBinder())) {
+ if (!isValidMediaProjection(asBinder())) {
Slog.w(TAG, "Attempted to stop inactive MediaProjection "
+ "(uid=" + Binder.getCallingUid() + ", "
+ "pid=" + Binder.getCallingPid() + ")");
return;
}
- mToken.unlinkToDeath(this, 0);
- mCallbackDelegate.dispatchStop();
- mProjectionGrants.remove(asBinder());
+ mToken.unlinkToDeath(mDeathEater, 0);
+ stopProjectionLocked(this);
}
}
@Override
- public void binderDied() {
- stop();
- }
-
- @Override
public void addCallback(IMediaProjectionCallback callback) {
if (callback == null) {
throw new IllegalArgumentException("callback must not be null");
@@ -278,52 +440,143 @@
mCallbackDelegate.remove(callback);
}
- public void dump(PrintWriter pw, String prefix) {
- pw.println(prefix + "(" + packageName + ", uid=" + uid + "): " + typeToString(mType));
+ public MediaProjectionInfo getProjectionInfo() {
+ return new MediaProjectionInfo(packageName, userHandle);
+ }
+
+ public void dump(PrintWriter pw) {
+ pw.println("(" + packageName + ", uid=" + uid + "): " + typeToString(mType));
}
}
+
private static class CallbackDelegate {
- private static final int MSG_ON_STOP = 0;
- private List<IMediaProjectionCallback> mCallbacks;
+ private Map<IBinder, IMediaProjectionCallback> mClientCallbacks;
+ private Map<IBinder, IMediaProjectionWatcherCallback> mWatcherCallbacks;
private Handler mHandler;
private Object mLock = new Object();
public CallbackDelegate() {
mHandler = new Handler(Looper.getMainLooper(), null, true /*async*/);
- mCallbacks = new ArrayList<IMediaProjectionCallback>();
+ mClientCallbacks = new ArrayMap<IBinder, IMediaProjectionCallback>();
+ mWatcherCallbacks = new ArrayMap<IBinder, IMediaProjectionWatcherCallback>();
}
public void add(IMediaProjectionCallback callback) {
synchronized (mLock) {
- mCallbacks.add(callback);
+ mClientCallbacks.put(callback.asBinder(), callback);
+ }
+ }
+
+ public void add(IMediaProjectionWatcherCallback callback) {
+ synchronized (mLock) {
+ mWatcherCallbacks.put(callback.asBinder(), callback);
}
}
public void remove(IMediaProjectionCallback callback) {
synchronized (mLock) {
- mCallbacks.remove(callback);
+ mClientCallbacks.remove(callback.asBinder());
}
}
- public void dispatchStop() {
+ public void remove(IMediaProjectionWatcherCallback callback) {
synchronized (mLock) {
- for (final IMediaProjectionCallback callback : mCallbacks) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- try {
- callback.onStop();
- } catch (RemoteException e) {
- Slog.w(TAG, "Failed to notify media projection has stopped", e);
- }
- }
- });
+ mWatcherCallbacks.remove(callback.asBinder());
+ }
+ }
+
+ public void dispatchStart(MediaProjection projection) {
+ if (projection == null) {
+ Slog.e(TAG, "Tried to dispatch start notification for a null media projection."
+ + " Ignoring!");
+ return;
+ }
+ synchronized (mLock) {
+ for (IMediaProjectionWatcherCallback callback : mWatcherCallbacks.values()) {
+ MediaProjectionInfo info = projection.getProjectionInfo();
+ mHandler.post(new WatcherStartCallback(info, callback));
+ }
+ }
+ }
+
+ public void dispatchStop(MediaProjection projection) {
+ if (projection == null) {
+ Slog.e(TAG, "Tried to dispatch stop notification for a null media projection."
+ + " Ignoring!");
+ return;
+ }
+ synchronized (mLock) {
+ for (IMediaProjectionCallback callback : mClientCallbacks.values()) {
+ mHandler.post(new ClientStopCallback(callback));
+ }
+
+ for (IMediaProjectionWatcherCallback callback : mWatcherCallbacks.values()) {
+ MediaProjectionInfo info = projection.getProjectionInfo();
+ mHandler.post(new WatcherStopCallback(info, callback));
}
}
}
}
+ private static final class WatcherStartCallback implements Runnable {
+ private IMediaProjectionWatcherCallback mCallback;
+ private MediaProjectionInfo mInfo;
+
+ public WatcherStartCallback(MediaProjectionInfo info,
+ IMediaProjectionWatcherCallback callback) {
+ mInfo = info;
+ mCallback = callback;
+ }
+
+ @Override
+ public void run() {
+ try {
+ mCallback.onStart(mInfo);
+ } catch (RemoteException e) {
+ Slog.w(TAG, "Failed to notify media projection has stopped", e);
+ }
+ }
+ }
+
+ private static final class WatcherStopCallback implements Runnable {
+ private IMediaProjectionWatcherCallback mCallback;
+ private MediaProjectionInfo mInfo;
+
+ public WatcherStopCallback(MediaProjectionInfo info,
+ IMediaProjectionWatcherCallback callback) {
+ mInfo = info;
+ mCallback = callback;
+ }
+
+ @Override
+ public void run() {
+ try {
+ mCallback.onStop(mInfo);
+ } catch (RemoteException e) {
+ Slog.w(TAG, "Failed to notify media projection has stopped", e);
+ }
+ }
+ }
+
+ private static final class ClientStopCallback implements Runnable {
+ private IMediaProjectionCallback mCallback;
+
+ public ClientStopCallback(IMediaProjectionCallback callback) {
+ mCallback = callback;
+ }
+
+ @Override
+ public void run() {
+ try {
+ mCallback.onStop();
+ } catch (RemoteException e) {
+ Slog.w(TAG, "Failed to notify media projection has stopped", e);
+ }
+ }
+ }
+
+
private static String typeToString(int type) {
switch (type) {
case MediaProjectionManager.TYPE_SCREEN_CAPTURE:
diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java
index 907eeb2..857b9e9 100644
--- a/services/core/java/com/android/server/net/IpConfigStore.java
+++ b/services/core/java/com/android/server/net/IpConfigStore.java
@@ -20,10 +20,10 @@
import android.net.IpConfiguration.IpAssignment;
import android.net.IpConfiguration.ProxySettings;
import android.net.LinkAddress;
-import android.net.LinkProperties;
import android.net.NetworkUtils;
import android.net.ProxyInfo;
import android.net.RouteInfo;
+import android.net.StaticIpConfiguration;
import android.os.Handler;
import android.os.HandlerThread;
import android.text.TextUtils;
@@ -41,6 +41,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.InetAddress;
+import java.net.Inet4Address;
import java.util.Map;
public class IpConfigStore {
@@ -69,40 +70,32 @@
}
private boolean writeConfig(DataOutputStream out, int configKey,
- IpConfiguration config) throws IOException {
+ IpConfiguration config) throws IOException {
boolean written = false;
try {
- LinkProperties linkProperties = config.linkProperties;
switch (config.ipAssignment) {
case STATIC:
out.writeUTF(IP_ASSIGNMENT_KEY);
out.writeUTF(config.ipAssignment.toString());
- for (LinkAddress linkAddr : linkProperties.getLinkAddresses()) {
- out.writeUTF(LINK_ADDRESS_KEY);
- out.writeUTF(linkAddr.getAddress().getHostAddress());
- out.writeInt(linkAddr.getPrefixLength());
- }
- for (RouteInfo route : linkProperties.getRoutes()) {
- out.writeUTF(GATEWAY_KEY);
- LinkAddress dest = route.getDestinationLinkAddress();
- if (dest != null) {
- out.writeInt(1);
- out.writeUTF(dest.getAddress().getHostAddress());
- out.writeInt(dest.getPrefixLength());
- } else {
- out.writeInt(0);
+ StaticIpConfiguration staticIpConfiguration = config.staticIpConfiguration;
+ if (staticIpConfiguration != null) {
+ if (staticIpConfiguration.ipAddress != null) {
+ LinkAddress ipAddress = staticIpConfiguration.ipAddress;
+ out.writeUTF(LINK_ADDRESS_KEY);
+ out.writeUTF(ipAddress.getAddress().getHostAddress());
+ out.writeInt(ipAddress.getPrefixLength());
}
- if (route.getGateway() != null) {
- out.writeInt(1);
- out.writeUTF(route.getGateway().getHostAddress());
- } else {
- out.writeInt(0);
+ if (staticIpConfiguration.gateway != null) {
+ out.writeUTF(GATEWAY_KEY);
+ out.writeInt(0); // Default route.
+ out.writeInt(1); // Have a gateway.
+ out.writeUTF(staticIpConfiguration.gateway.getHostAddress());
}
- }
- for (InetAddress inetAddr : linkProperties.getDnsServers()) {
- out.writeUTF(DNS_KEY);
- out.writeUTF(inetAddr.getHostAddress());
+ for (InetAddress inetAddr : staticIpConfiguration.dnsServers) {
+ out.writeUTF(DNS_KEY);
+ out.writeUTF(inetAddr.getHostAddress());
+ }
}
written = true;
break;
@@ -121,7 +114,7 @@
switch (config.proxySettings) {
case STATIC:
- ProxyInfo proxyProperties = linkProperties.getHttpProxy();
+ ProxyInfo proxyProperties = config.httpProxy;
String exclusionList = proxyProperties.getExclusionListAsString();
out.writeUTF(PROXY_SETTINGS_KEY);
out.writeUTF(config.proxySettings.toString());
@@ -134,7 +127,7 @@
written = true;
break;
case PAC:
- ProxyInfo proxyPacProperties = linkProperties.getHttpProxy();
+ ProxyInfo proxyPacProperties = config.httpProxy;
out.writeUTF(PROXY_SETTINGS_KEY);
out.writeUTF(config.proxySettings.toString());
out.writeUTF(PROXY_PAC_FILE);
@@ -159,7 +152,7 @@
out.writeInt(configKey);
}
} catch (NullPointerException e) {
- loge("Failure in writing " + config.linkProperties + e);
+ loge("Failure in writing " + config + e);
}
out.writeUTF(EOS);
@@ -196,7 +189,7 @@
// Default is DHCP with no proxy
IpAssignment ipAssignment = IpAssignment.DHCP;
ProxySettings proxySettings = ProxySettings.NONE;
- LinkProperties linkProperties = new LinkProperties();
+ StaticIpConfiguration staticIpConfiguration = new StaticIpConfiguration();
String proxyHost = null;
String pacFileUrl = null;
int proxyPort = -1;
@@ -213,13 +206,23 @@
} else if (key.equals(LINK_ADDRESS_KEY)) {
LinkAddress linkAddr = new LinkAddress(
NetworkUtils.numericToInetAddress(in.readUTF()), in.readInt());
- linkProperties.addLinkAddress(linkAddr);
+ if (linkAddr.getAddress() instanceof Inet4Address &&
+ staticIpConfiguration.ipAddress == null) {
+ staticIpConfiguration.ipAddress = linkAddr;
+ } else {
+ loge("Non-IPv4 or duplicate address: " + linkAddr);
+ }
} else if (key.equals(GATEWAY_KEY)) {
LinkAddress dest = null;
InetAddress gateway = null;
if (version == 1) {
// only supported default gateways - leave the dest/prefix empty
gateway = NetworkUtils.numericToInetAddress(in.readUTF());
+ if (staticIpConfiguration.gateway == null) {
+ staticIpConfiguration.gateway = gateway;
+ } else {
+ loge("Duplicate gateway: " + gateway.getHostAddress());
+ }
} else {
if (in.readInt() == 1) {
dest = new LinkAddress(
@@ -229,10 +232,16 @@
if (in.readInt() == 1) {
gateway = NetworkUtils.numericToInetAddress(in.readUTF());
}
+ RouteInfo route = new RouteInfo(dest, gateway);
+ if (route.isIPv4Default() &&
+ staticIpConfiguration.gateway == null) {
+ staticIpConfiguration.gateway = gateway;
+ } else {
+ loge("Non-IPv4 default or duplicate route: " + route);
+ }
}
- linkProperties.addRoute(new RouteInfo(dest, gateway));
} else if (key.equals(DNS_KEY)) {
- linkProperties.addDnsServer(
+ staticIpConfiguration.dnsServers.add(
NetworkUtils.numericToInetAddress(in.readUTF()));
} else if (key.equals(PROXY_SETTINGS_KEY)) {
proxySettings = ProxySettings.valueOf(in.readUTF());
@@ -258,9 +267,11 @@
IpConfiguration config = new IpConfiguration();
networks.put(id, config);
- config.linkProperties = linkProperties;
switch (ipAssignment) {
case STATIC:
+ config.staticIpConfiguration = staticIpConfiguration;
+ config.ipAssignment = ipAssignment;
+ break;
case DHCP:
config.ipAssignment = ipAssignment;
break;
@@ -276,16 +287,15 @@
switch (proxySettings) {
case STATIC:
- config.proxySettings = proxySettings;
- ProxyInfo ProxyInfo =
+ ProxyInfo proxyInfo =
new ProxyInfo(proxyHost, proxyPort, exclusionList);
- linkProperties.setHttpProxy(ProxyInfo);
+ config.proxySettings = proxySettings;
+ config.httpProxy = proxyInfo;
break;
case PAC:
+ ProxyInfo proxyPacProperties = new ProxyInfo(pacFileUrl);
config.proxySettings = proxySettings;
- ProxyInfo proxyPacProperties =
- new ProxyInfo(pacFileUrl);
- linkProperties.setHttpProxy(proxyPacProperties);
+ config.httpProxy = proxyPacProperties;
break;
case NONE:
config.proxySettings = proxySettings;
diff --git a/services/core/java/com/android/server/notification/NotificationDelegate.java b/services/core/java/com/android/server/notification/NotificationDelegate.java
index 1b59f52..97f0a1e 100644
--- a/services/core/java/com/android/server/notification/NotificationDelegate.java
+++ b/services/core/java/com/android/server/notification/NotificationDelegate.java
@@ -16,8 +16,6 @@
package com.android.server.notification;
-import android.os.IBinder;
-
public interface NotificationDelegate {
void onSetDisabled(int status);
void onClearAll(int callingUid, int callingPid, int userId);
@@ -29,7 +27,6 @@
int uid, int initialPid, String message, int userId);
void onPanelRevealed();
void onPanelHidden();
- boolean allowDisable(int what, IBinder token, String pkg);
void onNotificationVisibilityChanged(
String[] newlyVisibleKeys, String[] noLongerVisibleKeys);
void onNotificationExpansionChanged(String key, boolean userAction, boolean expanded);
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index f2ac963..7117933 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -29,7 +29,6 @@
import android.app.INotificationManager;
import android.app.ITransientNotification;
import android.app.Notification;
-import android.app.Notification.Builder;
import android.app.PendingIntent;
import android.app.StatusBarManager;
import android.content.BroadcastReceiver;
@@ -50,7 +49,6 @@
import android.media.IRingtonePlayer;
import android.net.Uri;
import android.os.Binder;
-import android.os.Build;
import android.os.Environment;
import android.os.Handler;
import android.os.HandlerThread;
@@ -585,11 +583,6 @@
}
@Override
- public boolean allowDisable(int what, IBinder token, String pkg) {
- return mZenModeHelper.allowDisable(what, token, pkg);
- }
-
- @Override
public void onNotificationVisibilityChanged(
String[] newlyVisibleKeys, String[] noLongerVisibleKeys) {
// Using ';' as separator since eventlogs uses ',' to separate
diff --git a/services/core/java/com/android/server/notification/ZenLog.java b/services/core/java/com/android/server/notification/ZenLog.java
index 525f5f8..f84409e 100644
--- a/services/core/java/com/android/server/notification/ZenLog.java
+++ b/services/core/java/com/android/server/notification/ZenLog.java
@@ -30,10 +30,7 @@
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
-import java.util.Arrays;
import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
public class ZenLog {
private static final String TAG = "ZenLog";
@@ -45,10 +42,6 @@
private static final String[] MSGS = new String[SIZE];
private static final SimpleDateFormat FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS");
- private static final Set<String> SYSTEM_PACKAGES = new HashSet<String>(Arrays.asList(
- "android",
- "com.android.systemui"
- ));
private static final int TYPE_INTERCEPTED = 1;
private static final int TYPE_ALLOW_DISABLE = 2;
@@ -76,11 +69,6 @@
append(TYPE_NOT_INTERCEPTED, record.getKey() + "," + reason);
}
- public static void traceAllowDisable(String pkg, boolean allowDisable, String reason) {
- if (SYSTEM_PACKAGES.contains(pkg)) return;
- append(TYPE_ALLOW_DISABLE, allowDisable + "," + pkg + "," + reason);
- }
-
public static void traceSetRingerMode(int ringerMode) {
append(TYPE_SET_RINGER_MODE, ringerModeToString(ringerMode));
}
diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index 758f334..0b93690 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -35,7 +35,6 @@
import android.media.AudioManager;
import android.net.Uri;
import android.os.Handler;
-import android.os.IBinder;
import android.os.UserHandle;
import android.provider.Settings.Global;
import android.provider.Settings.Secure;
@@ -265,18 +264,6 @@
dispatchOnZenModeChanged();
}
- public boolean allowDisable(int what, IBinder token, String pkg) {
- // TODO(cwren): delete this API before the next release. Bug:15344099
- boolean allowDisable = true;
- String reason = null;
- if (isDefaultPhoneApp(pkg)) {
- allowDisable = mZenMode == Global.ZEN_MODE_OFF || mConfig.allowCalls;
- reason = mZenMode == Global.ZEN_MODE_OFF ? "zenOff" : "allowCalls";
- }
- ZenLog.traceAllowDisable(pkg, allowDisable, reason);
- return allowDisable;
- }
-
public void dump(PrintWriter pw, String prefix) {
pw.print(prefix); pw.print("mZenMode=");
pw.println(Global.zenModeToString(mZenMode));
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index dca8ad4..0393518 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -19,6 +19,7 @@
import static android.content.pm.PackageManager.INSTALL_ALL_USERS;
import static android.content.pm.PackageManager.INSTALL_FROM_ADB;
import static android.content.pm.PackageManager.INSTALL_REPLACE_EXISTING;
+import static android.net.TrafficStats.MB_IN_BYTES;
import static com.android.internal.util.XmlUtils.readBitmapAttribute;
import static com.android.internal.util.XmlUtils.readBooleanAttribute;
import static com.android.internal.util.XmlUtils.readIntAttribute;
@@ -42,6 +43,7 @@
import android.content.Intent;
import android.content.IntentSender;
import android.content.IntentSender.SendIntentException;
+import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageInstaller;
import android.content.pm.IPackageInstallerCallback;
import android.content.pm.IPackageInstallerSession;
@@ -65,6 +67,7 @@
import android.os.SELinux;
import android.os.UserHandle;
import android.os.UserManager;
+import android.os.storage.StorageManager;
import android.system.ErrnoException;
import android.system.Os;
import android.text.TextUtils;
@@ -75,13 +78,14 @@
import android.util.Log;
import android.util.Slog;
import android.util.SparseArray;
+import android.util.SparseBooleanArray;
import android.util.Xml;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.content.PackageHelper;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.IoThread;
-import com.android.server.pm.PackageInstallerSession.Snapshot;
import com.google.android.collect.Sets;
import libcore.io.IoUtils;
@@ -108,6 +112,7 @@
// TODO: remove outstanding sessions when installer package goes away
// TODO: notify listeners in other users when package has been installed there
+ // TODO: purge expired sessions periodically in addition to at reboot
/** XML constants used in {@link #mSessionsFile} */
private static final String TAG_SESSIONS = "sessions";
@@ -117,6 +122,7 @@
private static final String ATTR_INSTALLER_PACKAGE_NAME = "installerPackageName";
private static final String ATTR_CREATED_MILLIS = "createdMillis";
private static final String ATTR_SESSION_STAGE_DIR = "sessionStageDir";
+ private static final String ATTR_SESSION_STAGE_CID = "sessionStageCid";
private static final String ATTR_SEALED = "sealed";
private static final String ATTR_MODE = "mode";
private static final String ATTR_INSTALL_FLAGS = "installFlags";
@@ -139,6 +145,7 @@
private final Context mContext;
private final PackageManagerService mPm;
private final AppOpsManager mAppOps;
+ private final StorageManager mStorage;
private final File mStagingDir;
private final HandlerThread mInstallThread;
@@ -165,10 +172,14 @@
@GuardedBy("mSessions")
private final SparseArray<PackageInstallerSession> mHistoricalSessions = new SparseArray<>();
+ /** Sessions allocated to legacy users */
+ @GuardedBy("mSessions")
+ private final SparseBooleanArray mLegacySessions = new SparseBooleanArray();
+
private static final FilenameFilter sStageFilter = new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
- return name.startsWith("vmdl") && name.endsWith(".tmp");
+ return isStageName(name);
}
};
@@ -176,6 +187,7 @@
mContext = context;
mPm = pm;
mAppOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
+ mStorage = StorageManager.from(mContext);
mStagingDir = stagingDir;
@@ -190,13 +202,16 @@
synchronized (mSessions) {
readSessionsLocked();
- // Clean up orphaned staging directories
- final ArraySet<File> stages = Sets.newArraySet(mStagingDir.listFiles(sStageFilter));
+ final ArraySet<File> unclaimed = Sets.newArraySet(mStagingDir.listFiles(sStageFilter));
+
+ // Ignore stages claimed by active sessions
for (int i = 0; i < mSessions.size(); i++) {
final PackageInstallerSession session = mSessions.valueAt(i);
- stages.remove(session.sessionStageDir);
+ unclaimed.remove(session.internalStageDir);
}
- for (File stage : stages) {
+
+ // Clean up orphaned staging directories
+ for (File stage : unclaimed) {
Slog.w(TAG, "Deleting orphan stage " + stage);
if (stage.isDirectory()) {
FileUtils.deleteContents(stage);
@@ -206,22 +221,64 @@
}
}
- public static boolean isStageFile(File file) {
- return sStageFilter.accept(null, file.getName());
+ public void onSecureContainersAvailable() {
+ synchronized (mSessions) {
+ final ArraySet<String> unclaimed = new ArraySet<>();
+ for (String cid : PackageHelper.getSecureContainerList()) {
+ if (isStageName(cid)) {
+ unclaimed.add(cid);
+ }
+ }
+
+ // Ignore stages claimed by active sessions
+ for (int i = 0; i < mSessions.size(); i++) {
+ final PackageInstallerSession session = mSessions.valueAt(i);
+ final String cid = session.externalStageCid;
+
+ if (unclaimed.remove(cid)) {
+ // Claimed by active session, mount it
+ PackageHelper.mountSdDir(cid, PackageManagerService.getEncryptKey(),
+ Process.SYSTEM_UID);
+ }
+ }
+
+ // Clean up orphaned staging containers
+ for (String cid : unclaimed) {
+ Slog.w(TAG, "Deleting orphan container " + cid);
+ PackageHelper.destroySdDir(cid);
+ }
+ }
+ }
+
+ public static boolean isStageName(String name) {
+ final boolean isFile = name.startsWith("vmdl") && name.endsWith(".tmp");
+ final boolean isContainer = name.startsWith("smdl") && name.endsWith(".tmp");
+ final boolean isLegacyContainer = name.startsWith("smdl2tmp");
+ return isFile || isContainer || isLegacyContainer;
}
@Deprecated
- public File allocateSessionDir() throws IOException {
+ public File allocateInternalStageDirLegacy() throws IOException {
synchronized (mSessions) {
try {
final int sessionId = allocateSessionIdLocked();
- return prepareSessionStageDir(sessionId);
+ mLegacySessions.put(sessionId, true);
+ return prepareInternalStageDir(sessionId);
} catch (IllegalStateException e) {
throw new IOException(e);
}
}
}
+ @Deprecated
+ public String allocateExternalStageCidLegacy() {
+ synchronized (mSessions) {
+ final int sessionId = allocateSessionIdLocked();
+ mLegacySessions.put(sessionId, true);
+ return "smdl" + sessionId + ".tmp";
+ }
+ }
+
private void readSessionsLocked() {
if (LOGD) Slog.v(TAG, "readSessionsLocked()");
@@ -246,9 +303,10 @@
Slog.w(TAG, "Abandoning old session first created at "
+ session.createdMillis);
valid = false;
- } else if (!session.sessionStageDir.exists()) {
- Slog.w(TAG, "Abandoning session with missing stage "
- + session.sessionStageDir);
+ } else if (session.internalStageDir != null
+ && !session.internalStageDir.exists()) {
+ Slog.w(TAG, "Abandoning internal session with missing stage "
+ + session.internalStageDir);
valid = false;
} else {
valid = true;
@@ -281,7 +339,9 @@
final int userId = readIntAttribute(in, ATTR_USER_ID);
final String installerPackageName = readStringAttribute(in, ATTR_INSTALLER_PACKAGE_NAME);
final long createdMillis = readLongAttribute(in, ATTR_CREATED_MILLIS);
- final File sessionStageDir = new File(readStringAttribute(in, ATTR_SESSION_STAGE_DIR));
+ final String stageDirRaw = readStringAttribute(in, ATTR_SESSION_STAGE_DIR);
+ final File stageDir = (stageDirRaw != null) ? new File(stageDirRaw) : null;
+ final String stageCid = readStringAttribute(in, ATTR_SESSION_STAGE_CID);
final boolean sealed = readBooleanAttribute(in, ATTR_SEALED);
final SessionParams params = new SessionParams(
@@ -299,7 +359,7 @@
return new PackageInstallerSession(mInternalCallback, mContext, mPm,
mInstallThread.getLooper(), sessionId, userId, installerPackageName, params,
- createdMillis, sessionStageDir, sealed);
+ createdMillis, stageDir, stageCid, sealed);
}
private void writeSessionsLocked() {
@@ -332,7 +392,6 @@
private void writeSessionLocked(XmlSerializer out, PackageInstallerSession session)
throws IOException {
final SessionParams params = session.params;
- final Snapshot snapshot = session.snapshot();
out.startTag(null, TAG_SESSION);
@@ -341,9 +400,14 @@
writeStringAttribute(out, ATTR_INSTALLER_PACKAGE_NAME,
session.installerPackageName);
writeLongAttribute(out, ATTR_CREATED_MILLIS, session.createdMillis);
- writeStringAttribute(out, ATTR_SESSION_STAGE_DIR,
- session.sessionStageDir.getAbsolutePath());
- writeBooleanAttribute(out, ATTR_SEALED, snapshot.sealed);
+ if (session.internalStageDir != null) {
+ writeStringAttribute(out, ATTR_SESSION_STAGE_DIR,
+ session.internalStageDir.getAbsolutePath());
+ }
+ if (session.externalStageCid != null) {
+ writeStringAttribute(out, ATTR_SESSION_STAGE_CID, session.externalStageCid);
+ }
+ writeBooleanAttribute(out, ATTR_SEALED, session.isSealed());
writeIntAttribute(out, ATTR_MODE, params.mode);
writeIntAttribute(out, ATTR_INSTALL_FLAGS, params.installFlags);
@@ -372,6 +436,15 @@
@Override
public int createSession(SessionParams params, String installerPackageName, int userId) {
+ try {
+ return createSessionInternal(params, installerPackageName, userId);
+ } catch (IOException e) {
+ throw ExceptionUtils.wrap(e);
+ }
+ }
+
+ private int createSessionInternal(SessionParams params, String installerPackageName, int userId)
+ throws IOException {
final int callingUid = Binder.getCallingUid();
mPm.enforceCrossUserPermission(callingUid, userId, true, "createSession");
@@ -393,14 +466,6 @@
params.installFlags |= INSTALL_REPLACE_EXISTING;
}
- switch (params.mode) {
- case SessionParams.MODE_FULL_INSTALL:
- case SessionParams.MODE_INHERIT_EXISTING:
- break;
- default:
- throw new IllegalArgumentException("Params must have valid mode set");
- }
-
// Defensively resize giant app icons
if (params.appIcon != null) {
final ActivityManager am = (ActivityManager) mContext.getSystemService(
@@ -413,13 +478,41 @@
}
}
- // Sanity check that install could fit
- if (params.sizeBytes > 0) {
- try {
- mPm.freeStorage(params.sizeBytes);
- } catch (IOException e) {
- throw ExceptionUtils.wrap(e);
+ // Figure out where we're going to be staging session data
+ final boolean stageInternal;
+
+ if (params.mode == SessionParams.MODE_FULL_INSTALL) {
+ // Brand new install, use best resolved location. This also verifies
+ // that target has enough free space for the install.
+ final int resolved = PackageHelper.resolveInstallLocation(mContext,
+ params.installLocation, params.sizeBytes, params.installFlags);
+ if (resolved == PackageHelper.RECOMMEND_INSTALL_INTERNAL) {
+ stageInternal = true;
+ } else if (resolved == PackageHelper.RECOMMEND_INSTALL_EXTERNAL) {
+ stageInternal = false;
+ } else {
+ throw new IOException("No storage with enough free space; res=" + resolved);
}
+
+ } else if (params.mode == SessionParams.MODE_INHERIT_EXISTING) {
+ // We always stage inheriting sessions on internal storage first,
+ // since we don't want to grow containers until we're sure that
+ // everything looks legit.
+ stageInternal = true;
+ checkInternalStorage(params.sizeBytes);
+
+ // If we have a good hunch we'll end up on external storage, verify
+ // free space there too.
+ final ApplicationInfo info = mPm.getApplicationInfo(params.appPackageName, 0,
+ userId);
+ if (info != null && (info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
+ checkExternalStorage(params.sizeBytes);
+
+ throw new UnsupportedOperationException("TODO: finish fleshing out ASEC support");
+ }
+
+ } else {
+ throw new IllegalArgumentException("Invalid install mode: " + params.mode);
}
final int sessionId;
@@ -437,14 +530,21 @@
"Too many historical sessions for UID " + callingUid);
}
+ final long createdMillis = System.currentTimeMillis();
sessionId = allocateSessionIdLocked();
- final long createdMillis = System.currentTimeMillis();
- final File sessionStageDir = prepareSessionStageDir(sessionId);
+ // We're staging to exactly one location
+ File stageDir = null;
+ String stageCid = null;
+ if (stageInternal) {
+ stageDir = prepareInternalStageDir(sessionId);
+ } else {
+ stageCid = prepareExternalStageCid(sessionId, params.sizeBytes);
+ }
session = new PackageInstallerSession(mInternalCallback, mContext, mPm,
mInstallThread.getLooper(), sessionId, userId, installerPackageName, params,
- createdMillis, sessionStageDir, false);
+ createdMillis, stageDir, stageCid, false);
mSessions.put(sessionId, session);
}
@@ -453,6 +553,29 @@
return sessionId;
}
+ private void checkInternalStorage(long sizeBytes) throws IOException {
+ if (sizeBytes <= 0) return;
+
+ final File target = Environment.getDataDirectory();
+ final long targetBytes = sizeBytes + mStorage.getStorageLowBytes(target);
+
+ mPm.freeStorage(targetBytes);
+ if (target.getUsableSpace() < targetBytes) {
+ throw new IOException("Not enough internal space to write " + sizeBytes + " bytes");
+ }
+ }
+
+ private void checkExternalStorage(long sizeBytes) throws IOException {
+ if (sizeBytes <= 0) return;
+
+ final File target = Environment.getExternalStorageDirectory();
+ final long targetBytes = sizeBytes + mStorage.getStorageLowBytes(target);
+
+ if (target.getUsableSpace() < targetBytes) {
+ throw new IOException("Not enough external space to write " + sizeBytes + " bytes");
+ }
+ }
+
@Override
public IPackageInstallerSession openSession(int sessionId) {
synchronized (mSessions) {
@@ -463,9 +586,7 @@
if (!isCallingUidOwner(session)) {
throw new SecurityException("Caller has no access to session " + sessionId);
}
- if (session.openCount.getAndIncrement() == 0) {
- mCallbacks.notifySessionOpened(sessionId, session.userId);
- }
+ session.open();
return session;
}
}
@@ -475,7 +596,8 @@
int sessionId;
do {
sessionId = mRandom.nextInt(Integer.MAX_VALUE - 1) + 1;
- if (mSessions.get(sessionId) == null && mHistoricalSessions.get(sessionId) == null) {
+ if (mSessions.get(sessionId) == null && mHistoricalSessions.get(sessionId) == null
+ && !mLegacySessions.get(sessionId, false)) {
return sessionId;
}
} while (n++ < 32);
@@ -483,11 +605,11 @@
throw new IllegalStateException("Failed to allocate session ID");
}
- private File prepareSessionStageDir(int sessionId) {
+ private File prepareInternalStageDir(int sessionId) throws IOException {
final File file = new File(mStagingDir, "vmdl" + sessionId + ".tmp");
if (file.exists()) {
- throw new IllegalStateException("Session dir already exists: " + file);
+ throw new IOException("Session dir already exists: " + file);
}
try {
@@ -495,16 +617,34 @@
Os.chmod(file.getAbsolutePath(), 0755);
} catch (ErrnoException e) {
// This purposefully throws if directory already exists
- throw new IllegalStateException("Failed to prepare session dir", e);
+ throw new IOException("Failed to prepare session dir", e);
}
if (!SELinux.restorecon(file)) {
- throw new IllegalStateException("Failed to restorecon session dir");
+ throw new IOException("Failed to restorecon session dir");
}
return file;
}
+ private String prepareExternalStageCid(int sessionId, long sizeBytes) throws IOException {
+ if (sizeBytes <= 0) {
+ throw new IOException("Session must provide valid size for ASEC");
+ }
+
+ final String cid = "smdl" + sessionId + ".tmp";
+
+ // Round up to nearest MB, plus another MB for filesystem overhead
+ final int sizeMb = (int) ((sizeBytes + MB_IN_BYTES) / MB_IN_BYTES) + 1;
+
+ if (PackageHelper.createSdDir(sizeMb, cid, PackageManagerService.getEncryptKey(),
+ Process.SYSTEM_UID, true) == null) {
+ throw new IOException("Failed to create ASEC");
+ }
+
+ return cid;
+ }
+
@Override
public SessionInfo getSessionInfo(int sessionId) {
synchronized (mSessions) {
@@ -643,7 +783,7 @@
public void onUserActionRequired(Intent intent) {
final Intent fillIn = new Intent();
fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
- PackageInstaller.STATUS_USER_ACTION_REQUIRED);
+ PackageInstaller.STATUS_PENDING_USER_ACTION);
fillIn.putExtra(Intent.EXTRA_INTENT, intent);
try {
mTarget.sendIntent(mContext, 0, fillIn, null, null);
@@ -679,7 +819,7 @@
public void onUserActionRequired(Intent intent) {
final Intent fillIn = new Intent();
fillIn.putExtra(PackageInstaller.EXTRA_STATUS,
- PackageInstaller.STATUS_USER_ACTION_REQUIRED);
+ PackageInstaller.STATUS_PENDING_USER_ACTION);
fillIn.putExtra(Intent.EXTRA_INTENT, intent);
try {
mTarget.sendIntent(mContext, 0, fillIn, null, null);
@@ -817,6 +957,11 @@
}
pw.println();
pw.decreaseIndent();
+
+ pw.println("Legacy install sessions:");
+ pw.increaseIndent();
+ pw.println(mLegacySessions.toString());
+ pw.decreaseIndent();
}
}
@@ -825,6 +970,10 @@
mCallbacks.notifySessionProgressChanged(session.sessionId, session.userId, progress);
}
+ public void onSessionOpened(PackageInstallerSession session) {
+ mCallbacks.notifySessionOpened(session.sessionId, session.userId);
+ }
+
public void onSessionClosed(PackageInstallerSession session) {
mCallbacks.notifySessionClosed(session.sessionId, session.userId);
}
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 5ef24f2..0616460 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -18,6 +18,7 @@
import static android.content.pm.PackageManager.INSTALL_FAILED_ABORTED;
import static android.content.pm.PackageManager.INSTALL_FAILED_ALREADY_EXISTS;
+import static android.content.pm.PackageManager.INSTALL_FAILED_CONTAINER_ERROR;
import static android.content.pm.PackageManager.INSTALL_FAILED_INTERNAL_ERROR;
import static android.content.pm.PackageManager.INSTALL_FAILED_INVALID_APK;
import static android.content.pm.PackageManager.INSTALL_FAILED_PACKAGE_CHANGED;
@@ -58,6 +59,7 @@
import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.content.PackageHelper;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
@@ -79,7 +81,6 @@
// TODO: enforce INSTALL_ALLOW_TEST
// TODO: enforce INSTALL_ALLOW_DOWNGRADE
- // TODO: handle INSTALL_EXTERNAL, INSTALL_INTERNAL
// TODO: treat INHERIT_EXISTING as installExistingPackage()
@@ -93,12 +94,24 @@
final String installerPackageName;
final SessionParams params;
final long createdMillis;
- final File sessionStageDir;
+
+ /** Internal location where staged data is written. */
+ final File internalStageDir;
+ /** External container where staged data is written. */
+ final String externalStageCid;
+
+ /**
+ * When a {@link SessionParams#MODE_INHERIT_EXISTING} session is installed
+ * into an ASEC, this is the container where the stage is combined with the
+ * existing install.
+ */
+ // TODO: persist this cid once we start splicing
+ String combinedCid;
/** Note that UID is not persisted; it's always derived at runtime. */
final int installerUid;
- AtomicInteger openCount = new AtomicInteger();
+ private final AtomicInteger mOpenCount = new AtomicInteger();
private final Object mLock = new Object();
@@ -119,6 +132,9 @@
private int mFinalStatus;
private String mFinalMessage;
+ @GuardedBy("mLock")
+ private File mResolvedStageDir;
+
/**
* Path to the resolved base APK for this session, which may point at an APK
* inside the session (when the session defines the base), or it may point
@@ -165,7 +181,7 @@
public PackageInstallerSession(PackageInstallerService.InternalCallback callback,
Context context, PackageManagerService pm, Looper looper, int sessionId, int userId,
String installerPackageName, SessionParams params, long createdMillis,
- File sessionStageDir, boolean sealed) {
+ File internalStageDir, String externalStageCid, boolean sealed) {
mCallback = callback;
mContext = context;
mPm = pm;
@@ -176,7 +192,8 @@
this.installerPackageName = installerPackageName;
this.params = params;
this.createdMillis = createdMillis;
- this.sessionStageDir = sessionStageDir;
+ this.internalStageDir = internalStageDir;
+ this.externalStageCid = externalStageCid;
mSealed = sealed;
@@ -195,23 +212,29 @@
public SessionInfo generateInfo() {
final SessionInfo info = new SessionInfo();
+ synchronized (mLock) {
+ info.sessionId = sessionId;
+ info.installerPackageName = installerPackageName;
+ info.resolvedBaseCodePath = mResolvedBaseCodePath;
+ info.progress = mProgress;
+ info.sealed = mSealed;
+ info.open = mOpenCount.get() > 0;
- info.sessionId = sessionId;
- info.installerPackageName = installerPackageName;
- info.resolvedBaseCodePath = mResolvedBaseCodePath;
- info.progress = mProgress;
- info.sealed = mSealed;
- info.open = openCount.get() > 0;
-
- info.mode = params.mode;
- info.sizeBytes = params.sizeBytes;
- info.appPackageName = params.appPackageName;
- info.appIcon = params.appIcon;
- info.appLabel = params.appLabel;
-
+ info.mode = params.mode;
+ info.sizeBytes = params.sizeBytes;
+ info.appPackageName = params.appPackageName;
+ info.appIcon = params.appIcon;
+ info.appLabel = params.appLabel;
+ }
return info;
}
+ public boolean isSealed() {
+ synchronized (mLock) {
+ return mSealed;
+ }
+ }
+
private void assertNotSealed(String cookie) {
synchronized (mLock) {
if (mSealed) {
@@ -220,6 +243,30 @@
}
}
+ /**
+ * Resolve the actual location where staged data should be written. This
+ * might point at an ASEC mount point, which is why we delay path resolution
+ * until someone actively works with the session.
+ */
+ private File getStageDir() throws IOException {
+ synchronized (mLock) {
+ if (mResolvedStageDir == null) {
+ if (internalStageDir != null) {
+ mResolvedStageDir = internalStageDir;
+ } else {
+ final String path = PackageHelper.getSdDir(externalStageCid);
+ if (path != null) {
+ mResolvedStageDir = new File(path);
+ } else {
+ throw new IOException(
+ "Failed to resolve container path for " + externalStageCid);
+ }
+ }
+ }
+ return mResolvedStageDir;
+ }
+ }
+
@Override
public void setClientProgress(float progress) {
synchronized (mLock) {
@@ -253,7 +300,11 @@
@Override
public String[] getNames() {
assertNotSealed("getNames");
- return sessionStageDir.list();
+ try {
+ return getStageDir().list();
+ } catch (IOException e) {
+ throw ExceptionUtils.wrap(e);
+ }
}
@Override
@@ -267,8 +318,6 @@
private ParcelFileDescriptor openWriteInternal(String name, long offsetBytes, long lengthBytes)
throws IOException {
- // TODO: relay over to DCS when installing to ASEC
-
// Quick sanity check of state, and allocate a pipe for ourselves. We
// then do heavy disk allocation outside the lock, but this open pipe
// will block any attempted install transitions.
@@ -285,7 +334,7 @@
if (!FileUtils.isValidExtFilename(name)) {
throw new IllegalArgumentException("Invalid name: " + name);
}
- final File target = new File(sessionStageDir, name);
+ final File target = new File(getStageDir(), name);
final FileDescriptor targetFd = Libcore.os.open(target.getAbsolutePath(),
O_CREAT | O_WRONLY, 0644);
@@ -331,7 +380,7 @@
if (!FileUtils.isValidExtFilename(name)) {
throw new IllegalArgumentException("Invalid name: " + name);
}
- final File target = new File(sessionStageDir, name);
+ final File target = new File(getStageDir(), name);
final FileDescriptor targetFd = Libcore.os.open(target.getAbsolutePath(), O_RDONLY, 0);
return new ParcelFileDescriptor(targetFd);
@@ -369,10 +418,18 @@
// beyond this point we may have hardlinks to the valid install
}
+ final File stageDir;
+ try {
+ stageDir = getStageDir();
+ } catch (IOException e) {
+ throw new PackageManagerException(INSTALL_FAILED_CONTAINER_ERROR,
+ "Failed to resolve stage dir", e);
+ }
+
// Verify that stage looks sane with respect to existing application.
// This currently only ensures packageName, versionCode, and certificate
// consistency.
- validateInstallLocked();
+ validateInstallLocked(stageDir);
Preconditions.checkNotNull(mPackageName);
Preconditions.checkNotNull(mSignatures);
@@ -394,7 +451,8 @@
// Inherit any packages and native libraries from existing install that
// haven't been overridden.
if (params.mode == SessionParams.MODE_INHERIT_EXISTING) {
- spliceExistingFilesIntoStage();
+ // TODO: implement splicing into existing ASEC
+ spliceExistingFilesIntoStage(stageDir);
}
// TODO: surface more granular state from dexopt
@@ -418,7 +476,8 @@
}
};
- mPm.installStage(mPackageName, this.sessionStageDir, localObserver, params,
+ // TODO: send ASEC cid if that's where we staged things
+ mPm.installStage(mPackageName, this.internalStageDir, null, localObserver, params,
installerPackageName, installerUid, new UserHandle(userId));
}
@@ -428,13 +487,13 @@
* <p>
* Renames package files in stage to match split names defined inside.
*/
- private void validateInstallLocked() throws PackageManagerException {
+ private void validateInstallLocked(File stageDir) throws PackageManagerException {
mPackageName = null;
mVersionCode = -1;
mSignatures = null;
mResolvedBaseCodePath = null;
- final File[] files = sessionStageDir.listFiles();
+ final File[] files = stageDir.listFiles();
if (ArrayUtils.isEmpty(files)) {
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, "No packages staged");
}
@@ -480,7 +539,7 @@
"Invalid filename: " + targetName);
}
- final File targetFile = new File(sessionStageDir, targetName);
+ final File targetFile = new File(stageDir, targetName);
if (!file.equals(targetFile)) {
file.renameTo(targetFile);
}
@@ -550,7 +609,7 @@
* Application is already installed; splice existing files that haven't been
* overridden into our stage.
*/
- private void spliceExistingFilesIntoStage() throws PackageManagerException {
+ private void spliceExistingFilesIntoStage(File stageDir) throws PackageManagerException {
final ApplicationInfo app = mPm.getApplicationInfo(mPackageName, 0, userId);
int n = 0;
@@ -559,7 +618,7 @@
for (File oldFile : oldFiles) {
if (!PackageParser.isApkFile(oldFile)) continue;
- final File newFile = new File(sessionStageDir, oldFile.getName());
+ final File newFile = new File(stageDir, oldFile.getName());
try {
Os.link(oldFile.getAbsolutePath(), newFile.getAbsolutePath());
n++;
@@ -588,9 +647,15 @@
}
}
+ public void open() {
+ if (mOpenCount.getAndIncrement() == 0) {
+ mCallback.onSessionOpened(this);
+ }
+ }
+
@Override
public void close() {
- if (openCount.decrementAndGet() == 0) {
+ if (mOpenCount.decrementAndGet() == 0) {
mCallback.onSessionClosed(this);
}
}
@@ -621,11 +686,22 @@
mSealed = true;
mDestroyed = true;
}
- FileUtils.deleteContents(sessionStageDir);
- sessionStageDir.delete();
+ if (internalStageDir != null) {
+ FileUtils.deleteContents(internalStageDir);
+ internalStageDir.delete();
+ }
+ if (externalStageCid != null) {
+ PackageHelper.destroySdDir(externalStageCid);
+ }
}
void dump(IndentingPrintWriter pw) {
+ synchronized (mLock) {
+ dumpLocked(pw);
+ }
+ }
+
+ private void dumpLocked(IndentingPrintWriter pw) {
pw.println("Session " + sessionId + ":");
pw.increaseIndent();
@@ -633,7 +709,8 @@
pw.printPair("installerPackageName", installerPackageName);
pw.printPair("installerUid", installerUid);
pw.printPair("createdMillis", createdMillis);
- pw.printPair("sessionStageDir", sessionStageDir);
+ pw.printPair("internalStageDir", internalStageDir);
+ pw.printPair("externalStageCid", externalStageCid);
pw.println();
params.dump(pw);
@@ -650,18 +727,4 @@
pw.decreaseIndent();
}
-
- Snapshot snapshot() {
- return new Snapshot(this);
- }
-
- static class Snapshot {
- final float clientProgress;
- final boolean sealed;
-
- public Snapshot(PackageInstallerSession session) {
- clientProgress = session.mClientProgress;
- sealed = session.mSealed;
- }
- }
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index c1f7e85..f47e64f 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -140,6 +140,7 @@
import android.os.Bundle;
import android.os.Environment;
import android.os.Environment.UserEnvironment;
+import android.os.storage.StorageManager;
import android.os.FileUtils;
import android.os.Handler;
import android.os.IBinder;
@@ -211,6 +212,7 @@
import dalvik.system.VMRuntime;
import libcore.io.IoUtils;
+import libcore.util.EmptyArray;
/**
* Keep track of all those .apks everywhere.
@@ -311,8 +313,6 @@
private static final String VENDOR_OVERLAY_DIR = "/vendor/overlay";
- static final String mTempContainerPrefix = "smdl2tmp";
-
private static String sPreferredInstructionSet;
final ServiceThread mHandlerThread;
@@ -3204,24 +3204,22 @@
if (matches.get(i).getTargetUserId() == targetUserId) return true;
}
}
-
ArrayList<String> packageNames = null;
SparseArray<ArrayList<String>> fromSource =
mSettings.mCrossProfilePackageInfo.get(sourceUserId);
if (fromSource != null) {
packageNames = fromSource.get(targetUserId);
- }
- if (packageNames != null && packageNames.contains(intent.getPackage())) {
- return true;
- }
- // We need the package name, so we try to resolve with the loosest flags possible
- List<ResolveInfo> resolveInfos = mActivities.queryIntent(
- intent, resolvedType, PackageManager.GET_UNINSTALLED_PACKAGES, targetUserId);
- int count = resolveInfos.size();
- for (int i = 0; i < count; i++) {
- ResolveInfo resolveInfo = resolveInfos.get(i);
- if (packageNames.contains(resolveInfo.activityInfo.packageName)) {
- return true;
+ if (packageNames != null) {
+ // We need the package name, so we try to resolve with the loosest flags possible
+ List<ResolveInfo> resolveInfos = mActivities.queryIntent(intent, resolvedType,
+ PackageManager.GET_UNINSTALLED_PACKAGES, targetUserId);
+ int count = resolveInfos.size();
+ for (int i = 0; i < count; i++) {
+ ResolveInfo resolveInfo = resolveInfos.get(i);
+ if (packageNames.contains(resolveInfo.activityInfo.packageName)) {
+ return true;
+ }
+ }
}
}
return false;
@@ -3294,6 +3292,7 @@
intent, resolvedType, flags, userId);
if (resolveInfo != null) {
result.add(resolveInfo);
+ Collections.sort(result, mResolvePrioritySorter);
}
return result;
}
@@ -4103,21 +4102,24 @@
for (File file : files) {
final boolean isPackage = (isApkFile(file) || file.isDirectory())
- && !PackageInstallerService.isStageFile(file);
+ && !PackageInstallerService.isStageName(file.getName());
if (!isPackage) {
- // Ignore entries which are not apk's
+ // Ignore entries which are not packages
continue;
}
try {
- scanPackageLI(file, flags | PackageParser.PARSE_MUST_BE_APK, scanMode, currentTime, null);
+ scanPackageLI(file, flags | PackageParser.PARSE_MUST_BE_APK,
+ scanMode, currentTime, null);
} catch (PackageManagerException e) {
Slog.w(TAG, "Failed to parse " + file + ": " + e.getMessage());
- // Don't mess around with apps in system partition.
+ // Delete invalid userdata apps
if ((flags & PackageParser.PARSE_IS_SYSTEM) == 0 &&
e.error == PackageManager.INSTALL_FAILED_INVALID_APK) {
- // Delete the apk
- Slog.w(TAG, "Cleaning up failed install of " + file);
+ Slog.w(TAG, "Deleting invalid package at " + file);
+ if (file.isDirectory()) {
+ FileUtils.deleteContents(file);
+ }
file.delete();
}
}
@@ -7841,19 +7843,19 @@
verificationParams.setInstallerUid(uid);
final Message msg = mHandler.obtainMessage(INIT_COPY);
- msg.obj = new InstallParams(originFile, false, observer, filteredFlags,
+ msg.obj = new InstallParams(originFile, null, false, observer, filteredFlags,
installerPackageName, verificationParams, user, packageAbiOverride);
mHandler.sendMessage(msg);
}
- void installStage(String packageName, File stageDir, IPackageInstallObserver2 observer,
- PackageInstaller.SessionParams params, String installerPackageName, int installerUid,
- UserHandle user) {
+ void installStage(String packageName, File stagedDir, String stagedCid,
+ IPackageInstallObserver2 observer, PackageInstaller.SessionParams params,
+ String installerPackageName, int installerUid, UserHandle user) {
final VerificationParams verifParams = new VerificationParams(null, params.originatingUri,
params.referrerUri, installerUid, null);
final Message msg = mHandler.obtainMessage(INIT_COPY);
- msg.obj = new InstallParams(stageDir, true, observer, params.installFlags,
+ msg.obj = new InstallParams(stagedDir, stagedCid, true, observer, params.installFlags,
installerPackageName, verifParams, user, params.abiOverride);
mHandler.sendMessage(msg);
}
@@ -8553,10 +8555,12 @@
* file, or a cluster directory. This location may be untrusted.
*/
final File originFile;
+ final String originCid;
/**
- * Flag indicating that {@link #originFile} has already been staged,
- * meaning downstream users don't need to defensively copy the contents.
+ * Flag indicating that {@link #originFile} or {@link #originCid} has
+ * already been staged, meaning downstream users don't need to
+ * defensively copy the contents.
*/
boolean originStaged;
@@ -8569,11 +8573,12 @@
final String packageAbiOverride;
boolean multiArch;
- InstallParams(File originFile, boolean originStaged, IPackageInstallObserver2 observer,
- int flags, String installerPackageName, VerificationParams verificationParams,
- UserHandle user, String packageAbiOverride) {
+ InstallParams(File originFile, String originCid, boolean originStaged,
+ IPackageInstallObserver2 observer, int flags, String installerPackageName,
+ VerificationParams verificationParams, UserHandle user, String packageAbiOverride) {
super(user);
- this.originFile = Preconditions.checkNotNull(originFile);
+ this.originFile = originFile;
+ this.originCid = originCid;
this.originStaged = originStaged;
this.observer = observer;
this.flags = flags;
@@ -8584,9 +8589,8 @@
@Override
public String toString() {
- return "InstallParams{"
- + Integer.toHexString(System.identityHashCode(this))
- + " " + originFile + "}";
+ return "InstallParams{" + Integer.toHexString(System.identityHashCode(this))
+ + " file=" + originFile + " cid=" + originCid + "}";
}
public ManifestDigest getManifestDigest() {
@@ -8655,15 +8659,6 @@
return pkgLite.recommendedInstallLocation;
}
- private long getMemoryLowThreshold() {
- final DeviceStorageMonitorInternal
- dsm = LocalServices.getService(DeviceStorageMonitorInternal.class);
- if (dsm == null) {
- return 0L;
- }
- return dsm.getMemoryLowThreshold();
- }
-
/*
* Invoke remote method to get package information and install
* location values. Override install location based on default
@@ -8681,14 +8676,9 @@
Slog.w(TAG, "Conflicting flags specified for installing on both internal and external");
ret = PackageManager.INSTALL_FAILED_INVALID_INSTALL_LOCATION;
} else {
- final long lowThreshold = getMemoryLowThreshold();
- if (lowThreshold == 0L) {
- Log.w(TAG, "Couldn't get low memory threshold; no free limit imposed");
- }
-
// Remote call to find out default install location
final String originPath = originFile.getAbsolutePath();
- pkgLite = mContainerService.getMinimalPackageInfo(originPath, flags, lowThreshold,
+ pkgLite = mContainerService.getMinimalPackageInfo(originPath, flags,
packageAbiOverride);
// Keep track of whether this package is a multiArch package until
// we perform a full scan of it. We need to do this because we might
@@ -8702,12 +8692,19 @@
*/
if (pkgLite.recommendedInstallLocation
== PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE) {
- final long size = mContainerService.calculateInstalledSize(
+ // TODO: focus freeing disk space on the target device
+ final StorageManager storage = StorageManager.from(mContext);
+ final long lowThreshold = storage.getStorageLowBytes(
+ Environment.getDataDirectory());
+
+ final long sizeBytes = mContainerService.calculateInstalledSize(
originPath, isForwardLocked(), packageAbiOverride);
- if (mInstaller.freeCache(size + lowThreshold) >= 0) {
+
+ if (mInstaller.freeCache(sizeBytes + lowThreshold) >= 0) {
pkgLite = mContainerService.getMinimalPackageInfo(originPath, flags,
- lowThreshold, packageAbiOverride);
+ packageAbiOverride);
}
+
/*
* The cache free must have deleted the file we
* downloaded to install.
@@ -9237,24 +9234,11 @@
}
boolean checkFreeStorage(IMediaContainerService imcs) throws RemoteException {
- final long lowThreshold;
+ final long sizeBytes = imcs.calculateInstalledSize(originFile.getAbsolutePath(),
+ isFwdLocked(), abiOverride);
- final DeviceStorageMonitorInternal
- dsm = LocalServices.getService(DeviceStorageMonitorInternal.class);
- if (dsm == null) {
- Log.w(TAG, "Couldn't get low memory threshold; no free limit imposed");
- lowThreshold = 0L;
- } else {
- if (dsm.isMemoryLow()) {
- Log.w(TAG, "Memory is reported as being too low; aborting package install");
- return false;
- }
-
- lowThreshold = dsm.getMemoryLowThreshold();
- }
-
- return imcs.checkInternalFreeStorage(originFile.getAbsolutePath(), isFwdLocked(),
- lowThreshold);
+ final StorageManager storage = StorageManager.from(mContext);
+ return (sizeBytes <= storage.getStorageBytesUntilLow(Environment.getDataDirectory()));
}
int copyApk(IMediaContainerService imcs, boolean temp) throws RemoteException {
@@ -9266,7 +9250,7 @@
resourceFile = originFile;
} else {
try {
- final File tempDir = mInstallerService.allocateSessionDir();
+ final File tempDir = mInstallerService.allocateInternalStageDirLegacy();
codeFile = tempDir;
resourceFile = tempDir;
} catch (IOException e) {
@@ -9571,12 +9555,22 @@
}
void createCopyFile() {
- cid = getTempContainerId();
+ cid = mInstallerService.allocateExternalStageCidLegacy();
}
boolean checkFreeStorage(IMediaContainerService imcs) throws RemoteException {
- return imcs.checkExternalFreeStorage(originFile.getAbsolutePath(), isFwdLocked(),
+ final long sizeBytes = imcs.calculateInstalledSize(packagePath, isFwdLocked(),
abiOverride);
+
+ final File target;
+ if (isExternal()) {
+ target = Environment.getExternalStorageDirectory();
+ } else {
+ target = Environment.getDataDirectory();
+ }
+
+ final StorageManager storage = StorageManager.from(mContext);
+ return (sizeBytes <= storage.getStorageBytesUntilLow(target));
}
private final boolean isExternal() {
@@ -11582,18 +11576,20 @@
}
}
- if (DEBUG_PREFERRED) {
- Slog.i(TAG, existing.size() + " existing preferred matches for:");
- filter.dump(new LogPrinter(Log.INFO, TAG), " ");
- }
- for (int i = 0; i < existing.size(); i++) {
- PreferredActivity pa = existing.get(i);
+ if (existing != null) {
if (DEBUG_PREFERRED) {
- Slog.i(TAG, "Removing existing preferred activity "
- + pa.mPref.mComponent + ":");
- pa.dump(new LogPrinter(Log.INFO, TAG), " ");
+ Slog.i(TAG, existing.size() + " existing preferred matches for:");
+ filter.dump(new LogPrinter(Log.INFO, TAG), " ");
}
- pir.removeFilter(pa);
+ for (int i = 0; i < existing.size(); i++) {
+ PreferredActivity pa = existing.get(i);
+ if (DEBUG_PREFERRED) {
+ Slog.i(TAG, "Removing existing preferred activity "
+ + pa.mPref.mComponent + ":");
+ pa.dump(new LogPrinter(Log.INFO, TAG), " ");
+ }
+ pir.removeFilter(pa);
+ }
}
}
addPreferredActivityInternal(filter, match, set, activity, true, userId,
@@ -12655,7 +12651,7 @@
private boolean mMediaMounted = false;
- private String getEncryptKey() {
+ static String getEncryptKey() {
try {
String sdEncKey = SystemKeyStore.getInstance().retrieveKeyHexString(
SD_ENCRYPTION_KEYSTORE_NAME);
@@ -12675,30 +12671,6 @@
Slog.e(TAG, "Failed to retrieve encryption keys with exception: " + ioe);
return null;
}
-
- }
-
- /* package */static String getTempContainerId() {
- int tmpIdx = 1;
- String list[] = PackageHelper.getSecureContainerList();
- if (list != null) {
- for (final String name : list) {
- // Ignore null and non-temporary container entries
- if (name == null || !name.startsWith(mTempContainerPrefix)) {
- continue;
- }
-
- String subStr = name.substring(mTempContainerPrefix.length());
- try {
- int cid = Integer.parseInt(subStr);
- if (cid >= tmpIdx) {
- tmpIdx = cid + 1;
- }
- } catch (NumberFormatException e) {
- }
- }
- }
- return mTempContainerPrefix + tmpIdx;
}
/*
@@ -12756,31 +12728,27 @@
*/
private void updateExternalMediaStatusInner(boolean isMounted, boolean reportStatus,
boolean externalStorage) {
- // Collection of uids
- int uidArr[] = null;
- // Collection of stale containers
- HashSet<String> removeCids = new HashSet<String>();
- // Collection of packages on external media with valid containers.
- HashMap<AsecInstallArgs, String> processCids = new HashMap<AsecInstallArgs, String>();
- // Get list of secure containers.
- final String list[] = PackageHelper.getSecureContainerList();
- if (list == null || list.length == 0) {
- Log.i(TAG, "No secure containers on sdcard");
+ ArrayMap<AsecInstallArgs, String> processCids = new ArrayMap<>();
+ int[] uidArr = EmptyArray.INT;
+
+ final String[] list = PackageHelper.getSecureContainerList();
+ if (ArrayUtils.isEmpty(list)) {
+ Log.i(TAG, "No secure containers found");
} else {
// Process list of secure containers and categorize them
// as active or stale based on their package internal state.
- int uidList[] = new int[list.length];
- int num = 0;
+
// reader
synchronized (mPackages) {
for (String cid : list) {
+ // Leave stages untouched for now; installer service owns them
+ if (PackageInstallerService.isStageName(cid)) continue;
+
if (DEBUG_SD_INSTALL)
Log.i(TAG, "Processing container " + cid);
String pkgName = getAsecPackageName(cid);
if (pkgName == null) {
- if (DEBUG_SD_INSTALL)
- Log.i(TAG, "Container : " + cid + " stale");
- removeCids.add(cid);
+ Slog.i(TAG, "Found stale container " + cid + " with no package name");
continue;
}
if (DEBUG_SD_INSTALL)
@@ -12788,8 +12756,7 @@
final PackageSetting ps = mSettings.mPackages.get(pkgName);
if (ps == null) {
- Log.i(TAG, "Deleting container with no matching settings " + cid);
- removeCids.add(cid);
+ Slog.i(TAG, "Found stale container " + cid + " with no matching settings");
continue;
}
@@ -12815,35 +12782,25 @@
processCids.put(args, ps.codePathString);
final int uid = ps.appId;
if (uid != -1) {
- uidList[num++] = uid;
+ uidArr = ArrayUtils.appendInt(uidArr, uid);
}
} else {
- Log.i(TAG, "Deleting stale container for " + cid);
- removeCids.add(cid);
+ Slog.i(TAG, "Found stale container " + cid + ": expected codePath="
+ + ps.codePathString);
}
}
}
- if (num > 0) {
- // Sort uid list
- Arrays.sort(uidList, 0, num);
- // Throw away duplicates
- uidArr = new int[num];
- uidArr[0] = uidList[0];
- int di = 0;
- for (int i = 1; i < num; i++) {
- if (uidList[i - 1] != uidList[i]) {
- uidArr[di++] = uidList[i];
- }
- }
- }
+ Arrays.sort(uidArr);
}
+
// Process packages with valid entries.
if (isMounted) {
if (DEBUG_SD_INSTALL)
Log.i(TAG, "Loading packages");
- loadMediaPackages(processCids, uidArr, removeCids);
+ loadMediaPackages(processCids, uidArr);
startCleaningPackages();
+ mInstallerService.onSecureContainersAvailable();
} else {
if (DEBUG_SD_INSTALL)
Log.i(TAG, "Unloading packages");
@@ -12851,8 +12808,8 @@
}
}
- private void sendResourcesChangedBroadcast(boolean mediaStatus, boolean replacing,
- ArrayList<String> pkgList, int uidArr[], IIntentReceiver finishedReceiver) {
+ private void sendResourcesChangedBroadcast(boolean mediaStatus, boolean replacing,
+ ArrayList<String> pkgList, int uidArr[], IIntentReceiver finishedReceiver) {
int size = pkgList.size();
if (size > 0) {
// Send broadcasts here
@@ -12877,11 +12834,10 @@
* the cid is added to list of removeCids. We currently don't delete stale
* containers.
*/
- private void loadMediaPackages(HashMap<AsecInstallArgs, String> processCids, int uidArr[],
- HashSet<String> removeCids) {
+ private void loadMediaPackages(ArrayMap<AsecInstallArgs, String> processCids, int[] uidArr) {
ArrayList<String> pkgList = new ArrayList<String>();
Set<AsecInstallArgs> keys = processCids.keySet();
- boolean doGc = false;
+
for (AsecInstallArgs args : keys) {
String codePath = processCids.get(args);
if (DEBUG_SD_INSTALL)
@@ -12909,7 +12865,6 @@
parseFlags |= PackageParser.PARSE_FORWARD_LOCK;
}
- doGc = true;
synchronized (mInstallLock) {
PackageParser.Package pkg = null;
try {
@@ -12939,9 +12894,7 @@
} finally {
if (retCode != PackageManager.INSTALL_SUCCEEDED) {
- // Don't destroy container here. Wait till gc clears things
- // up.
- removeCids.add(args.cid);
+ Log.w(TAG, "Container " + args.cid + " is stale, retCode=" + retCode);
}
}
}
@@ -12976,21 +12929,6 @@
if (pkgList.size() > 0) {
sendResourcesChangedBroadcast(true, false, pkgList, uidArr, null);
}
- // Force gc to avoid any stale parser references that we might have.
- if (doGc) {
- Runtime.getRuntime().gc();
- }
- // List stale containers and destroy stale temporary containers.
- if (removeCids != null) {
- for (String cid : removeCids) {
- if (cid.startsWith(mTempContainerPrefix)) {
- Log.i(TAG, "Destroying stale temporary container " + cid);
- PackageHelper.destroySdDir(cid);
- } else {
- Log.w(TAG, "Container " + cid + " is stale");
- }
- }
- }
}
/*
@@ -13014,7 +12952,7 @@
* that we always have to post this message if status has been requested no
* matter what.
*/
- private void unloadMediaPackages(HashMap<AsecInstallArgs, String> processCids, int uidArr[],
+ private void unloadMediaPackages(ArrayMap<AsecInstallArgs, String> processCids, int uidArr[],
final boolean reportStatus) {
if (DEBUG_SD_INSTALL)
Log.i(TAG, "unloading media packages");
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index 297dacf..f85e2d9 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -22,7 +22,6 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.os.UserHandle;
-import android.service.notification.StatusBarNotification;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Resources;
@@ -39,9 +38,7 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
@@ -187,10 +184,6 @@
@Override
public void disable(int what, IBinder token, String pkg) {
- if (!mNotificationDelegate.allowDisable(what, token, pkg)) {
- if (SPEW) Slog.d(TAG, "Blocking disable request from " + pkg);
- return;
- }
disableInternal(mCurrentUserId, what, token, pkg);
}
diff --git a/services/core/java/com/android/server/tv/TvInputHal.java b/services/core/java/com/android/server/tv/TvInputHal.java
index e7dd82d..c7d95aa 100644
--- a/services/core/java/com/android/server/tv/TvInputHal.java
+++ b/services/core/java/com/android/server/tv/TvInputHal.java
@@ -19,12 +19,11 @@
import android.media.tv.TvInputHardwareInfo;
import android.media.tv.TvStreamConfig;
import android.os.Handler;
-import android.os.HandlerThread;
import android.os.Message;
-import android.view.Surface;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseIntArray;
+import android.view.Surface;
import java.util.LinkedList;
import java.util.Queue;
@@ -64,12 +63,12 @@
int generation);
private static native void nativeClose(long ptr);
- private Object mLock = new Object();
+ private final Object mLock = new Object();
private long mPtr = 0;
private final Callback mCallback;
private final Handler mHandler;
- private SparseIntArray mStreamConfigGenerations = new SparseIntArray();
- private SparseArray<TvStreamConfig[]> mStreamConfigs = new SparseArray<>();;
+ private final SparseIntArray mStreamConfigGenerations = new SparseIntArray();
+ private final SparseArray<TvStreamConfig[]> mStreamConfigs = new SparseArray<>();
public TvInputHal(Callback callback) {
mCallback = callback;
@@ -153,7 +152,7 @@
// Handler.Callback implementation
- private Queue<Message> mPendingMessageQueue = new LinkedList<Message>();
+ private final Queue<Message> mPendingMessageQueue = new LinkedList<Message>();
@Override
public boolean handleMessage(Message msg) {
diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
index ae9ae13..425eff3 100644
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -20,14 +20,12 @@
import static android.media.tv.TvInputManager.INPUT_STATE_DISCONNECTED;
import android.content.Context;
-import android.content.Intent;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiHotplugEvent;
import android.hardware.hdmi.IHdmiControlService;
import android.hardware.hdmi.IHdmiDeviceEventListener;
import android.hardware.hdmi.IHdmiHotplugEventListener;
-import android.hardware.hdmi.IHdmiInputChangeListener;
import android.hardware.hdmi.IHdmiSystemAudioModeChangeListener;
import android.media.AudioDevicePort;
import android.media.AudioFormat;
@@ -39,7 +37,6 @@
import android.media.AudioPortConfig;
import android.media.tv.ITvInputHardware;
import android.media.tv.ITvInputHardwareCallback;
-import android.media.tv.TvContract;
import android.media.tv.TvInputHardwareInfo;
import android.media.tv.TvInputInfo;
import android.media.tv.TvStreamConfig;
@@ -77,7 +74,6 @@
class TvInputHardwareManager implements TvInputHal.Callback {
private static final String TAG = TvInputHardwareManager.class.getSimpleName();
- private final Context mContext;
private final Listener mListener;
private final TvInputHal mHal = new TvInputHal(this);
private final SparseArray<Connection> mConnections = new SparseArray<>();
@@ -107,7 +103,6 @@
private final Object mLock = new Object();
public TvInputHardwareManager(Context context, Listener listener) {
- mContext = context;
mListener = listener;
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
mHal.init();
diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index 88ce860..a084cab 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -691,6 +691,10 @@
private void releaseSessionLocked(IBinder sessionToken, int callingUid, int userId) {
SessionState sessionState = getSessionStateLocked(sessionToken, callingUid, userId);
if (sessionState.mSession != null) {
+ UserState userState = getUserStateLocked(userId);
+ if (sessionToken == userState.mainSessionToken) {
+ setMainLocked(sessionToken, false, callingUid, userId);
+ }
try {
sessionState.mSession.release();
} catch (RemoteException e) {
@@ -704,6 +708,9 @@
private void removeSessionStateLocked(IBinder sessionToken, int userId) {
UserState userState = getUserStateLocked(userId);
if (sessionToken == userState.mainSessionToken) {
+ if (DEBUG) {
+ Slog.d(TAG, "mainSessionToken=null");
+ }
userState.mainSessionToken = null;
}
@@ -740,6 +747,25 @@
mWatchLogHandler.obtainMessage(WatchLogHandler.MSG_LOG_WATCH_END, args).sendToTarget();
}
+ private void setMainLocked(IBinder sessionToken, boolean isMain, int callingUid, int userId) {
+ SessionState sessionState = getSessionStateLocked(sessionToken, callingUid, userId);
+ if (sessionState.mHardwareSessionToken != null) {
+ sessionState = getSessionStateLocked(sessionState.mHardwareSessionToken,
+ Process.SYSTEM_UID, userId);
+ }
+ ServiceState serviceState = getServiceStateLocked(sessionState.mInfo.getComponent(),
+ userId);
+ if (!serviceState.mIsHardware) {
+ return;
+ }
+ ITvInputSession session = getSessionLocked(sessionState);
+ try {
+ session.setMain(isMain);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "error in setMain", e);
+ }
+ }
+
private void notifyInputAddedLocked(UserState userState, String inputId) {
if (DEBUG) {
Slog.d(TAG, "notifyInputAdded: inputId = " + inputId);
@@ -1050,6 +1076,9 @@
@Override
public void releaseSession(IBinder sessionToken, int userId) {
+ if (DEBUG) {
+ Slog.d(TAG, "releaseSession(): " + sessionToken);
+ }
final int callingUid = Binder.getCallingUid();
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid,
userId, "releaseSession");
@@ -1065,6 +1094,9 @@
@Override
public void setMainSession(IBinder sessionToken, int userId) {
+ if (DEBUG) {
+ Slog.d(TAG, "setMainSession(): " + sessionToken);
+ }
final int callingUid = Binder.getCallingUid();
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid,
userId, "setMainSession");
@@ -1075,50 +1107,19 @@
if (userState.mainSessionToken == sessionToken) {
return;
}
-
- SessionState newMainSessionState = getSessionStateLocked(
- sessionToken, callingUid, resolvedUserId);
- if (newMainSessionState.mHardwareSessionToken != null) {
- newMainSessionState = getSessionStateLocked(
- newMainSessionState.mHardwareSessionToken,
- Process.SYSTEM_UID, resolvedUserId);
+ if (DEBUG) {
+ Slog.d(TAG, "mainSessionToken=" + sessionToken);
}
- ServiceState newMainServiceState = getServiceStateLocked(
- newMainSessionState.mInfo.getComponent(), resolvedUserId);
- ITvInputSession newMainSession = getSessionLocked(newMainSessionState);
-
- ServiceState oldMainServiceState = null;
- ITvInputSession oldMainSession = null;
- if (userState.mainSessionToken != null) {
- SessionState oldMainSessionState = getSessionStateLocked(
- userState.mainSessionToken, Process.SYSTEM_UID, resolvedUserId);
- if (oldMainSessionState.mHardwareSessionToken != null) {
- oldMainSessionState = getSessionStateLocked(
- oldMainSessionState.mHardwareSessionToken,
- Process.SYSTEM_UID, resolvedUserId);
- }
- oldMainServiceState = getServiceStateLocked(
- oldMainSessionState.mInfo.getComponent(), resolvedUserId);
- oldMainSession = getSessionLocked(oldMainSessionState);
- }
-
+ IBinder oldMainSessionToken = userState.mainSessionToken;
userState.mainSessionToken = sessionToken;
// Inform the new main session first.
- // See {@link TvInputService#onSetMainSession}.
- if (newMainServiceState.mIsHardware) {
- try {
- newMainSession.setMainSession(true);
- } catch (RemoteException e) {
- Slog.e(TAG, "error in setMainSession", e);
- }
+ // See {@link TvInputService.Session#onSetMain}.
+ if (sessionToken != null) {
+ setMainLocked(sessionToken, true, callingUid, userId);
}
- if (oldMainSession != null && oldMainServiceState.mIsHardware) {
- try {
- oldMainSession.setMainSession(false);
- } catch (RemoteException e) {
- Slog.e(TAG, "error in setMainSession", e);
- }
+ if (oldMainSessionToken != null) {
+ setMainLocked(oldMainSessionToken, false, Process.SYSTEM_UID, userId);
}
}
} finally {
@@ -1800,11 +1801,8 @@
UserState userState = getUserStateLocked(mUserId);
for (SessionState sessionState : userState.sessionStateMap.values()) {
if (mSessionToken == sessionState.mHardwareSessionToken) {
- try {
- sessionState.mSession.release();
- } catch (RemoteException e) {
- Slog.e(TAG, "error in release", e);
- }
+ releaseSessionLocked(sessionState.mSessionToken, Process.SYSTEM_UID,
+ mUserId);
try {
sessionState.mClient.onSessionReleased(sessionState.mSeq);
} catch (RemoteException e) {
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 112972f..b57a090 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -51,6 +51,7 @@
import android.app.admin.DevicePolicyManager;
import android.animation.ValueAnimator;
import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -58,6 +59,7 @@
import android.content.pm.PackageManager;
import android.content.res.CompatibilityInfo;
import android.content.res.Configuration;
+import android.database.ContentObserver;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.Canvas;
@@ -428,7 +430,7 @@
/**
* Stores for each user whether screencapture is disabled
* This array is essentially a cache for all userId for
- * {@link android.app.admin.DevicePolicyManager#getScreenCaptureDisabled(null, userId)}
+ * {@link android.app.admin.DevicePolicyManager#getScreenCaptureDisabled}
*/
SparseArray<Boolean> mScreenCaptureDisabled = new SparseArray<Boolean>();
@@ -539,6 +541,21 @@
boolean mHardKeyboardAvailable;
boolean mShowImeWithHardKeyboard;
OnHardKeyboardStatusChangeListener mHardKeyboardStatusChangeListener;
+ SettingsObserver mSettingsObserver;
+
+ private final class SettingsObserver extends ContentObserver {
+ public SettingsObserver() {
+ super(new Handler());
+ ContentResolver resolver = mContext.getContentResolver();
+ resolver.registerContentObserver(Settings.Secure.getUriFor(
+ Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD), false, this);
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ updateShowImeWithHardKeyboard();
+ }
+ }
final ArrayList<WindowToken> mWallpaperTokens = new ArrayList<WindowToken>();
@@ -838,6 +855,9 @@
filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
mContext.registerReceiver(mBroadcastReceiver, filter);
+ mSettingsObserver = new SettingsObserver();
+ updateShowImeWithHardKeyboard();
+
mHoldingScreenWakeLock = mPowerManager.newWakeLock(
PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ON_AFTER_RELEASE, TAG);
mHoldingScreenWakeLock.setReferenceCounted(false);
@@ -2315,9 +2335,12 @@
return WindowManagerGlobal.ADD_BAD_APP_TOKEN;
}
} else if (token.appWindowToken != null) {
- Slog.i(TAG, "Non-null appWindowToken for system window of type=" + type);
- // app token should be null for any other window types.
- token.appWindowToken = null;
+ Slog.w(TAG, "Non-null appWindowToken for system window of type=" + type);
+ // It is not valid to use an app token with other system types; we will
+ // instead make a new token for it (as if null had been passed in for the token).
+ attrs.token = null;
+ token = new WindowToken(this, null, -1, false);
+ addToken = true;
}
win = new WindowState(this, session, client, token,
@@ -7015,7 +7038,6 @@
boolean hardKeyboardAvailable = config.keyboard != Configuration.KEYBOARD_NOKEYS;
if (hardKeyboardAvailable != mHardKeyboardAvailable) {
mHardKeyboardAvailable = hardKeyboardAvailable;
- mShowImeWithHardKeyboard = !hardKeyboardAvailable;
mH.removeMessages(H.REPORT_HARD_KEYBOARD_STATUS_CHANGE);
mH.sendEmptyMessage(H.REPORT_HARD_KEYBOARD_STATUS_CHANGE);
}
@@ -7039,18 +7061,12 @@
}
}
- public boolean isShowImeWithHardKeyboardEnabled() {
+ public void updateShowImeWithHardKeyboard() {
+ boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser(
+ mContext.getContentResolver(), Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0,
+ mCurrentUserId) == 1;
synchronized (mWindowMap) {
- return mShowImeWithHardKeyboard;
- }
- }
-
- public void setShowImeWithHardKeyboard(boolean enabled) {
- synchronized (mWindowMap) {
- if (mShowImeWithHardKeyboard != enabled) {
- mShowImeWithHardKeyboard = enabled;
- mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);
- }
+ mShowImeWithHardKeyboard = showImeWithHardKeyboard;
}
}
@@ -7062,15 +7078,14 @@
}
void notifyHardKeyboardStatusChange() {
- final boolean available, showImeWithHardKeyboard;
+ final boolean available;
final OnHardKeyboardStatusChangeListener listener;
synchronized (mWindowMap) {
listener = mHardKeyboardStatusChangeListener;
available = mHardKeyboardAvailable;
- showImeWithHardKeyboard = mShowImeWithHardKeyboard;
}
if (listener != null) {
- listener.onHardKeyboardStatusChange(available, showImeWithHardKeyboard);
+ listener.onHardKeyboardStatusChange(available);
}
}
@@ -11053,7 +11068,7 @@
}
public interface OnHardKeyboardStatusChangeListener {
- public void onHardKeyboardStatusChange(boolean available, boolean showIme);
+ public void onHardKeyboardStatusChange(boolean available);
}
void debugLayoutRepeats(final String msg, int pendingLayoutChanges) {
diff --git a/telecomm/java/android/telecomm/AudioState.java b/telecomm/java/android/telecomm/AudioState.java
index dc28b16..491af14 100644
--- a/telecomm/java/android/telecomm/AudioState.java
+++ b/telecomm/java/android/telecomm/AudioState.java
@@ -56,14 +56,12 @@
/** Bit vector of all routes supported by this call. */
public final int supportedRouteMask;
- /** @hide */
public AudioState(boolean isMuted, int route, int supportedRouteMask) {
this.isMuted = isMuted;
this.route = route;
this.supportedRouteMask = supportedRouteMask;
}
- /** @hide */
public AudioState(AudioState state) {
isMuted = state.isMuted;
route = state.route;
diff --git a/telecomm/java/android/telecomm/InCallService.java b/telecomm/java/android/telecomm/InCallService.java
index de05d1c..5795e0e 100644
--- a/telecomm/java/android/telecomm/InCallService.java
+++ b/telecomm/java/android/telecomm/InCallService.java
@@ -16,6 +16,7 @@
package android.telecomm;
+import android.annotation.SdkConstant;
import android.app.PendingIntent;
import android.app.Service;
import android.content.Intent;
@@ -39,6 +40,13 @@
* {@hide}
*/
public abstract class InCallService extends Service {
+
+ /**
+ * The {@link Intent} that must be declared as handled by the service.
+ */
+ @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
+ public static final String SERVICE_INTERFACE = "android.telecomm.InCallService";
+
private static final int MSG_SET_IN_CALL_ADAPTER = 1;
private static final int MSG_ADD_CALL = 2;
private static final int MSG_UPDATE_CALL = 3;
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index c50110a..d4f8362 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2459,7 +2459,7 @@
* @param filePath
* @return The APDU response.
*/
- byte[] iccExchangeSimIO(int fileID, int command, int p1, int p2, int p3,
+ public byte[] iccExchangeSimIO(int fileID, int command, int p1, int p2, int p3,
String filePath) {
try {
return getITelephony().iccExchangeSimIO(fileID, command, p1, p2,
diff --git a/tests/ActivityTests/AndroidManifest.xml b/tests/ActivityTests/AndroidManifest.xml
index 15d075c..c0898d30 100644
--- a/tests/ActivityTests/AndroidManifest.xml
+++ b/tests/ActivityTests/AndroidManifest.xml
@@ -23,6 +23,7 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
<uses-permission android:name="android.permission.MANAGE_USERS" />
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<application android:label="ActivityTest">
<activity android:name="ActivityTestMain">
<intent-filter>
diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
index 0e063d6..9002125 100644
--- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
+++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
@@ -34,6 +34,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.graphics.Bitmap;
+import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -130,6 +131,12 @@
mSecondUser = ui.id;
}
}
+
+ /*
+ AlertDialog ad = new AlertDialog.Builder(this).setTitle("title").setMessage("message").create();
+ ad.getWindow().getAttributes().type = WindowManager.LayoutParams.TYPE_SYSTEM_ERROR;
+ ad.show();
+ */
}
@Override
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 700afa1..4ce5045 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -66,6 +66,8 @@
libexpat \
libziparchive-host
+aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"
+
ifeq ($(HOST_OS),linux)
aaptHostLdLibs += -lrt -ldl -lpthread
endif
@@ -91,6 +93,7 @@
LOCAL_CFLAGS += -Wno-format-y2k
LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS
+LOCAL_CFLAGS += $(aaptCFlags)
ifeq (darwin,$(HOST_OS))
LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
endif
@@ -110,7 +113,9 @@
LOCAL_STATIC_LIBRARIES += \
libaapt \
$(aaptHostStaticLibs)
+
LOCAL_LDLIBS += $(aaptHostLdLibs)
+LOCAL_CFLAGS += $(aaptCFlags)
include $(BUILD_HOST_EXECUTABLE)
@@ -128,7 +133,9 @@
LOCAL_STATIC_LIBRARIES += \
libaapt \
$(aaptHostStaticLibs)
+
LOCAL_LDLIBS += $(aaptHostLdLibs)
+LOCAL_CFLAGS += $(aaptCFlags)
include $(BUILD_HOST_NATIVE_TEST)
@@ -159,6 +166,7 @@
libstlport_static \
libexpat_static
+LOCAL_CFLAGS += $(aaptCFlags)
LOCAL_CPPFLAGS += -Wno-non-virtual-dtor
include $(BUILD_EXECUTABLE)
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 5d146d6..bdbf47b 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -24,6 +24,10 @@
using namespace android;
+#ifndef AAPT_VERSION
+ #define AAPT_VERSION ""
+#endif
+
/*
* Show version info. All the cool kids do it.
*/
@@ -32,7 +36,7 @@
if (bundle->getFileSpecCount() != 0) {
printf("(ignoring extra arguments)\n");
}
- printf("Android Asset Packaging Tool, v0.2\n");
+ printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n");
return 0;
}
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..f17189a
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..2a9757d
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_wifi_signal_4_fully.png
index 931daed..6248cfd 100644
--- a/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_wifi_signal_4_fully.png
+++ b/tools/layoutlib/bridge/resources/bars/v18/hdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_wifi_signal_4_fully.png
index 6e1ac91..441de0c 100644
--- a/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_wifi_signal_4_fully.png
+++ b/tools/layoutlib/bridge/resources/bars/v18/mdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_wifi_signal_4_fully.png
index 625c61d..459a1a2 100644
--- a/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_wifi_signal_4_fully.png
+++ b/tools/layoutlib/bridge/resources/bars/v18/xhdpi/stat_sys_wifi_signal_4_fully.png
Binary files differ
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_100.png b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_100.png
new file mode 100644
index 0000000..555bcd9
--- /dev/null
+++ b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_100.png
Binary files differ
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 3c37b94..ac2a176 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -21,7 +21,7 @@
import android.net.IpConfiguration.ProxySettings;
import android.net.IpConfiguration.IpAssignment;
import android.net.ProxyInfo;
-import android.net.LinkProperties;
+import android.net.StaticIpConfiguration;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
@@ -1096,13 +1096,13 @@
}
/** @hide */
- public LinkProperties getLinkProperties() {
- return mIpConfiguration.linkProperties;
+ public StaticIpConfiguration getStaticIpConfiguration() {
+ return mIpConfiguration.getStaticIpConfiguration();
}
/** @hide */
- public void setLinkProperties(LinkProperties linkProperties) {
- mIpConfiguration.linkProperties = linkProperties;
+ public void setStaticIpConfiguration(StaticIpConfiguration staticIpConfiguration) {
+ mIpConfiguration.setStaticIpConfiguration(staticIpConfiguration);
}
/** @hide */
@@ -1126,9 +1126,19 @@
}
/** @hide */
+ public ProxyInfo getHttpProxy() {
+ return mIpConfiguration.httpProxy;
+ }
+
+ /** @hide */
+ public void setHttpProxy(ProxyInfo httpProxy) {
+ mIpConfiguration.httpProxy = httpProxy;
+ }
+
+ /** @hide */
public void setProxy(ProxySettings settings, ProxyInfo proxy) {
mIpConfiguration.proxySettings = settings;
- mIpConfiguration.linkProperties.setHttpProxy(proxy);
+ mIpConfiguration.httpProxy = proxy;
}
/** Implement the Parcelable interface {@hide} */
