OSDN Git Service
TreeHugger Robot [Fri, 10 Jun 2016 21:20:48 +0000 (21:20 +0000)]
Merge "Provide default fallback in theme" into nyc-dev
Sid Soundararajan [Fri, 10 Jun 2016 20:37:59 +0000 (20:37 +0000)]
Merge "Recents TV: Add a check for touch enabled mode for starting dismiss animation" into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 20:17:32 +0000 (20:17 +0000)]
Merge "Fixed check for volume name." into nyc-dev
Svetoslav Ganov [Fri, 10 Jun 2016 19:55:28 +0000 (19:55 +0000)]
Merge "Blame only location observers that actually receive updates" into nyc-dev
Jorim Jaggi [Fri, 10 Jun 2016 19:45:16 +0000 (12:45 -0700)]
Provide default fallback in theme
This reverts a part of Ifb724b5c5feea3ed70d68e5bd7615fa91185e743:
Since we enforce the background to be non-translucent, this part
can be reverted and only causes unnecessary regressions.
Change-Id: Ide7b60ee05eb275344fee2f4370f0e8461ef2783
Fixes:
29192742
Eino-Ville Talvala [Fri, 10 Jun 2016 19:44:03 +0000 (19:44 +0000)]
Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
* changes:
Camera2: Fix error codes for CameraDevice.StateCallback.onError()
Camera2: Protect MarshalRegistry against concurrent access
TreeHugger Robot [Fri, 10 Jun 2016 19:38:49 +0000 (19:38 +0000)]
Merge "Check for valid paths when getVolumeList() returns invisible volumes." into nyc-dev
Felipe Leme [Fri, 10 Jun 2016 18:09:11 +0000 (11:09 -0700)]
Check for valid paths when getVolumeList() returns invisible volumes.
The FLAG_INCLUDE_INVISIBLE was created to let SM.getStorageVolumes()
return mounted volumes (like USB drives), but in the current form it
might return invalid volumes. For example, when a SD Card is adopted as
an internal storage, it will return 2 volumes instead of one, the "bad"
one being:
VolumeInfo{emulated}:
type=EMULATED diskId=null partGuid=null mountFlags=0 mountUserId=-1
state=UNMOUNTED
fsType=null fsUuid=null fsLabel=null
path=null internalPath=null
As such, we need to filter out those volumes that don't have a path.
BUG:
29250241
Change-Id: I3f84b53eac98f31f918d843c70f9d42983e2a438
Felipe Leme [Thu, 9 Jun 2016 22:25:00 +0000 (15:25 -0700)]
Fixed check for volume name.
There are scenarios - like when an SD Card is adopted as internal
storage - where the getBestVolumeDescription() returns null, in which
case we should use the StorageVolume description instead (or a default
value if such description is also null)>
Change-Id: Ia11c3f4069dfbe252c568210ee60b5d8c384d863
Fixes:
29198046
Sid Soundararajan [Thu, 9 Jun 2016 22:40:14 +0000 (15:40 -0700)]
Recents TV: Add a check for touch enabled mode for starting dismiss animation
Fix until we figure out if Gamepad not eating key events during talkback is
inteneded behavior.
BUG:
29208918
Change-Id: Iffe652f10e88d0218875264f31e9d7658d75e71e
John Reck [Fri, 10 Jun 2016 17:46:53 +0000 (17:46 +0000)]
Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev
Dianne Hackborn [Fri, 10 Jun 2016 17:43:13 +0000 (17:43 +0000)]
Merge "Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format" into nyc-dev
Eino-Ville Talvala [Fri, 10 Jun 2016 00:07:13 +0000 (17:07 -0700)]
Camera2: Fix error codes for CameraDevice.StateCallback.onError()
Existing code assumed that ICameraDeviceCallbacks and
CameraDevice.StateCallback have the same error code values for matching
errors.
They do not.
Also remove duplicate error code definitions now present in the AIDL
file for ICameraDeviceCallbacks.
Bug:
29248704
Change-Id: I069e2b7ef3be7887634e128f1accb50b7558f3fd
Eino-Ville Talvala [Thu, 9 Jun 2016 20:08:59 +0000 (13:08 -0700)]
Camera2: Protect MarshalRegistry against concurrent access
Multiple CameraMetadataNative objects could be reading and writing
to the metadata marshaler registry simultaneously.
This can lead to an infinite loop in the HashMap in the worst case,
so add synchronization against this.
Bug:
29043079
Change-Id: Ic5e9e58a9333b99b4bea87bf790c9fbfadfbbea9
Tianjie Xu [Fri, 10 Jun 2016 17:13:53 +0000 (17:13 +0000)]
Merge "Collect statistics of source build version" into nyc-dev
Chong Zhang [Fri, 10 Jun 2016 17:06:08 +0000 (17:06 +0000)]
Merge "Use user id 0 to get missing appId for debugger" into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 16:03:20 +0000 (16:03 +0000)]
Merge "Fix framebuffer incomplete errors" into nyc-dev
Svet Ganov [Fri, 10 Jun 2016 07:12:38 +0000 (00:12 -0700)]
Blame only location observers that actually receive updates
The location manager service keeps update records for all apps
registered to receive location updates. If an app does not have
the location permission then its update record is skipped when
dispatching location updates. However, the battery blame is spread
across all apps requesting location updates even if they don't
receive such because of lacking permission.
bug:
28804546
Change-Id: Iee96fd6f304c7a49f9c70484e52abc0ed1538a29
TreeHugger Robot [Fri, 10 Jun 2016 02:12:22 +0000 (02:12 +0000)]
Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 00:53:43 +0000 (00:53 +0000)]
Merge "BatteryStats: Bump checkin format version to 18" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 00:46:19 +0000 (17:46 -0700)]
BatteryStats: Bump checkin format version to 18
Bug:
28811636
Change-Id: If2229c438e60f20746c91bccbcaa6d72ca5f0802
Adam Lesinski [Wed, 8 Jun 2016 20:55:55 +0000 (13:55 -0700)]
BatteryStats: Record fine grained battery discharge
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.
Bug:
28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
Phil Weaver [Fri, 10 Jun 2016 00:08:21 +0000 (00:08 +0000)]
Merge "Stop magnifying surface insets." into nyc-dev
Chris Craik [Thu, 9 Jun 2016 23:57:11 +0000 (16:57 -0700)]
Fix framebuffer incomplete errors
bug:
29127615
Primarily fixes case where 0 dimensioned layers could be
created/updated. Additionally, adds more logging in incomplete
framebuffer cases, if they still occur.
Change-Id: Ib90dbbafd6905aca3c8f46e64064e13a308f713d
Dianne Hackborn [Thu, 9 Jun 2016 23:58:45 +0000 (16:58 -0700)]
Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format
Change-Id: I36d4e5e20ff2ed1b4d02a04390e0415b9b2394a3
Chong Zhang [Thu, 9 Jun 2016 23:15:27 +0000 (16:15 -0700)]
Use user id 0 to get missing appId for debugger
When forceStopPackageLocked is used to kill existing app process for
relaunching with debugger, user id could be -1 and getPackageUid will
already return -1. This results in killPackageProcessesLocked() not
able to find and kill the app, and wait for debugger will.
This also revert commit
55c9d739 (ag/969408) which tried to fix the
same problem but got it wrong. It's valid to -D when the process is
already running, as we're supposed to kill it. The really problem is
that the killing fails because of bad appId.
bug:
28980761
Change-Id: Ibebdcc26865464216a1f4b6773e540921cdad7d2
Chris Tate [Thu, 9 Jun 2016 23:34:22 +0000 (23:34 +0000)]
Merge "Don't allow restore sessions during backups" into nyc-dev
Phil Weaver [Thu, 9 Jun 2016 23:32:09 +0000 (23:32 +0000)]
Merge "Improve accessibility window title behavior" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 23:28:26 +0000 (16:28 -0700)]
Don't allow restore sessions during backups
Gracefully no-op if apps attempt to restore themselves while there is
a backup pass in flight.
Bug
29135379
Change-Id: I8f0b5cd9d149b703e1de7a3a0b4b54c3aff766b6
John Reck [Thu, 9 Jun 2016 23:26:21 +0000 (16:26 -0700)]
Don't call surfaceCreated for just changed surfaces
Fixes:
29223302
If the surface only changed we want to just call onSurfaceChanged,
not onSurfaceCreated.
Change-Id: I65c8b210a7e34eaa2862020335ee7f6ef56eeac2
Tianjie Xu [Wed, 8 Jun 2016 22:02:35 +0000 (15:02 -0700)]
Collect statistics of source build version
Parse the last_install and report the source build version of an ota
update.
Related CL in: ag/
1121141
Bug:
28658632
Change-Id: I5e835c144aabe97fda681f60397ebf4416f7bd4f
Svetoslav Ganov [Thu, 9 Jun 2016 22:44:50 +0000 (22:44 +0000)]
Merge "Protect the android.intent.action.CALL_PRIVILEGED broadcast" into nyc-dev
Dianne Hackborn [Thu, 9 Jun 2016 22:16:26 +0000 (22:16 +0000)]
Merge "Fix more of issue #
28689719: Runtime restart" into nyc-dev
Chris Tate [Thu, 9 Jun 2016 22:06:59 +0000 (22:06 +0000)]
Merge "Turn down factory-default lock wallpaper support" into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 21:16:01 +0000 (21:16 +0000)]
Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 20:57:52 +0000 (20:57 +0000)]
Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 20:44:48 +0000 (13:44 -0700)]
Turn down factory-default lock wallpaper support
The infrastructure is here but not yet fully plumbed, so gracefully
provide the historical behavior until the rest is in place.
Bug
29220492
Change-Id: I36feaf68099d85e4ae11a5262002ee85346703ed
Phil Weaver [Thu, 9 Jun 2016 17:24:53 +0000 (10:24 -0700)]
Improve accessibility window title behavior
Un-reverts ag/
1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.
Bug:
28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
Philip P. Moltmann [Thu, 9 Jun 2016 20:35:58 +0000 (20:35 +0000)]
Merge "Cache resources needed to sort media sizes." into nyc-dev
Andrii Kulian [Thu, 9 Jun 2016 20:27:28 +0000 (20:27 +0000)]
Merge "Don't update mTaskToReturnTo when task is cleared" into nyc-dev
Dianne Hackborn [Wed, 8 Jun 2016 23:33:29 +0000 (16:33 -0700)]
Fix more of issue #
28689719: Runtime restart
Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
Pavlin Radoslavov [Thu, 9 Jun 2016 19:58:07 +0000 (12:58 -0700)]
Unlock mBluetoothLock.readLock() instead of double-locking it
Bug:
29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
Adam Lesinski [Thu, 9 Jun 2016 18:17:10 +0000 (11:17 -0700)]
ResourcesManager: Apply ContextThemeWrapper config
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.
Bug:
27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
Adam Powell [Thu, 9 Jun 2016 19:36:16 +0000 (12:36 -0700)]
Make Activity.getReferrer tolerate custom Parcelables in intents
Referrer information is passed as an intent extra to each Activity,
therefore if that intent contains a custom parcelable unmarshaling
the intent extras will fail in a call to getReferrer. Insulate apps
from this concern and log a warning when it happens.
Bug
28972438
Change-Id: I37dbc033bfcfe816e4b58b382c012854fbed943b
TreeHugger Robot [Thu, 9 Jun 2016 19:28:10 +0000 (19:28 +0000)]
Merge "PiP animation: Move window with resize when ending animation." into nyc-dev
Philip P. Moltmann [Thu, 9 Jun 2016 19:24:04 +0000 (19:24 +0000)]
Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev
Andrii Kulian [Thu, 9 Jun 2016 00:20:44 +0000 (17:20 -0700)]
Don't update mTaskToReturnTo when task is cleared
If activity launch has moved other task that was over home while
clearing task - don't override its mTaskToReturnTo not to loose
the original value of other task.
Bug:
28986980
Change-Id: Ib1680769fbb8a8d99f2b210c8d9cd8fe6fd5a196
Eric Schmidt [Thu, 9 Jun 2016 17:56:38 +0000 (17:56 +0000)]
Merge \\"docs: Added links to performance resources section\\" into mnc-io-docs am:
e4b1149320
am:
2dea7d3836
Change-Id: I73d48da51be02656ae636686b42253c35ebc3762
Eric Schmidt [Thu, 9 Jun 2016 17:45:53 +0000 (17:45 +0000)]
Merge \"docs: Added links to performance resources section\" into mnc-io-docs
am:
e4b1149320
Change-Id: Ib1fa097035dce4d6e4c55ac6d87aa26bacceade8
Eric Schmidt [Thu, 9 Jun 2016 17:37:25 +0000 (17:37 +0000)]
Merge "docs: Added links to performance resources section" into mnc-io-docs
Robert Carr [Fri, 3 Jun 2016 20:28:48 +0000 (13:28 -0700)]
PiP animation: Move window with resize when ending animation.
At the end of the animation (when going from larger to smaller),
we are left with a scaled surface, that we want to seamlessly
resize to an unscaled surface of the new size. Because we have scaled
the shadow region of the surface, the position of the content
will differ before and after the resize applies. We use new
SurfaceFlinger API to cause position updates to apply after
resize. Because we have to switch into SCALING_MODE_FREEZE,
we could end up prematurely cropping the window, so we
switch to using screen space crop for the pinned stack.
Bug:
28899837
Change-Id: I9b762a237413e4fa3d432e67d30c7125bfef484c
Aurimas Liutikas [Thu, 9 Jun 2016 16:57:02 +0000 (16:57 +0000)]
Merge \\"Correct the size of example bitmap for xxhdpi.\\" into mnc-io-docs am:
396ed8d2cf
am:
6e70538600
Change-Id: I0714693f2f19107d056be72944343c9636a0ff7e
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:58 +0000 (16:56 +0000)]
Merge \\"Remove duplicate the from AppBar documentation.\\" into mnc-io-docs am:
f9f7a29fe9
am:
9bd21c0fbb
Change-Id: Ib9c0255b772b0fc47d46758abdace1cf6bc9b045
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:54 +0000 (16:56 +0000)]
Merge \\"Fix code example in testing-support-library.\\" into mnc-io-docs am:
e172a4b692
am:
5b8233126d
Change-Id: Iee54ea9150f67b2595df3919ee06d307778d6666
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:50 +0000 (16:56 +0000)]
Merge \\"Fix a link to CustomTabsCallback in support-library docs.\\" into mnc-io-docs am:
2ff2814a4a
am:
5d75a24896
Change-Id: Iaa7fa74ba79eb4b6ea2bdc8274ab1498cb6b79f5
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:15 +0000 (16:45 +0000)]
Merge \"Correct the size of example bitmap for xxhdpi.\" into mnc-io-docs
am:
396ed8d2cf
Change-Id: Idb10cf41ebddc99613fcac41e9b6367c6e6b9e46
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:13 +0000 (16:45 +0000)]
Merge \"Remove duplicate the from AppBar documentation.\" into mnc-io-docs
am:
f9f7a29fe9
Change-Id: I7c79f4df131bbb7f2f5189af901cd75ac240c194
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:12 +0000 (16:45 +0000)]
Merge \"Fix code example in testing-support-library.\" into mnc-io-docs
am:
e172a4b692
Change-Id: I47e39e2a19289d12d1d54000c974ef9c1c97839a
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:10 +0000 (16:45 +0000)]
Merge \"Fix a link to CustomTabsCallback in support-library docs.\" into mnc-io-docs
am:
2ff2814a4a
Change-Id: Ic1b3b40336bc22503ac86aea96bd98b705adf96d
Aurimas Liutikas [Thu, 9 Jun 2016 16:42:16 +0000 (16:42 +0000)]
Merge "Correct the size of example bitmap for xxhdpi." into mnc-io-docs
Aurimas Liutikas [Thu, 9 Jun 2016 16:41:54 +0000 (16:41 +0000)]
Merge "Remove duplicate the from AppBar documentation." into mnc-io-docs
Philip P. Moltmann [Thu, 9 Jun 2016 16:39:55 +0000 (09:39 -0700)]
Handling of Fuji Xerox in RecommendationService.
- Display name
- Fix exclusion of Fuji from Xerox plugin
Bug:
28908572
Change-Id: I00c235a4eb09a681717eb3be65d586246a069f4b
Aurimas Liutikas [Thu, 9 Jun 2016 16:39:25 +0000 (16:39 +0000)]
Merge "Fix code example in testing-support-library." into mnc-io-docs
Aurimas Liutikas [Thu, 9 Jun 2016 16:39:14 +0000 (16:39 +0000)]
Merge "Fix a link to CustomTabsCallback in support-library docs." into mnc-io-docs
Jason Monk [Thu, 9 Jun 2016 15:25:00 +0000 (15:25 +0000)]
Merge "QS: Fix crash when removing pages in RTL" into nyc-dev
Jason Monk [Thu, 9 Jun 2016 15:22:48 +0000 (15:22 +0000)]
Merge "QS Detail: Fix up open/close animations" into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 14:15:24 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Jason Monk [Thu, 9 Jun 2016 13:59:56 +0000 (09:59 -0400)]
QS: Fix crash when removing pages in RTL
Change-Id: Ic8f082a3dc61fbf12f576d4cffb8ab31e669cb7c
Fixes:
29122756
TreeHugger Robot [Thu, 9 Jun 2016 13:51:09 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 12:39:26 +0000 (05:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: If53965a4f42f4c97334fc88250af6a72a9658b8a
Auto-generated-cl: translation import
Narayan Kamath [Tue, 7 Jun 2016 08:31:55 +0000 (09:31 +0100)]
PackageManagerService: fix NPE while renaming foreign dex markers.
The User passed in to scan*LI is null during the initial boot scan
and maybeRenameForeignDexMarkers wasn't expecting it. We attempt to
rename markers for all users if that happens.
bug:
29167406
Change-Id: I892dcc542e75d62d72c062b8ce5506ef85df5fc2
TreeHugger Robot [Thu, 9 Jun 2016 06:22:19 +0000 (06:22 +0000)]
Merge "Don't depend directly on AppplicationInfo" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 05:27:34 +0000 (22:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3234ff4e69fbcc40de1d78539fcc886957b5dce5
Auto-generated-cl: translation import
David Sehr [Thu, 9 Jun 2016 05:20:19 +0000 (05:20 +0000)]
Merge "Simplify code paths computation, allow adb root to dump" into nyc-dev
Svet Ganov [Thu, 9 Jun 2016 05:15:32 +0000 (22:15 -0700)]
Protect the android.intent.action.CALL_PRIVILEGED broadcast
bug:
29178416
Change-Id: I5e8f1e5423d0dd59cc532a45142b2401f5e5a45b
Chad Brubaker [Wed, 8 Jun 2016 19:57:46 +0000 (12:57 -0700)]
Don't depend directly on AppplicationInfo
ApplicationInfo is mutable and unfortunately some apps do actually
modify the flags. Due to the lazy loading nature of the network security
config this may lead to issues. Instead cache the needed flags and
resources at application startup.
Bug:
29063413
(cherry picked from commit
276ee969be89ba25e439839341953236adf80c40)
Change-Id: If638a716fd903b4e9dbabcbecb38bd4e26fef08c
TreeHugger Robot [Thu, 9 Jun 2016 03:45:19 +0000 (03:45 +0000)]
Merge "Throw proper exception in ResourcesManager" into nyc-dev
Erik Wolsheimer [Thu, 9 Jun 2016 03:42:27 +0000 (03:42 +0000)]
Merge \\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\" into cw-e-dev am:
eae242cfe8 -s ours
am:
8b04b0db2e -s ours
Change-Id: I459eec39aa68d4e165264189ce051bc8b4253965
Erik Wolsheimer [Thu, 9 Jun 2016 03:37:02 +0000 (03:37 +0000)]
Merge \"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\" into cw-e-dev
am:
eae242cfe8 -s ours
Change-Id: Ia418392bcbab16d2c02689fdc79138b1cee304ab
Erik Wolsheimer [Thu, 9 Jun 2016 03:25:42 +0000 (03:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev
fionaxu [Thu, 9 Jun 2016 02:39:15 +0000 (02:39 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e am:
eb53629bf7 am:
16dfcd7950 -s ours am:
2d03c0f956 am:
dc9a7c7b23 am:
e892848035
am:
7e2c6c3440 -s ours
Change-Id: Ic463b8a7a1a1ea537f1fea4fd36dd176464ac789
Chen Xu [Thu, 9 Jun 2016 02:32:51 +0000 (02:32 +0000)]
Merge "resolve merge conflicts of
afed6f8 to nyc-dev" into nyc-dev
Sreevani Sreejith [Thu, 9 Jun 2016 02:28:58 +0000 (02:28 +0000)]
Merge \\"docs: Documented how to handle alarms in AA media apps.\\" into mnc-io-docs am:
21d6abf7be
am:
539b6b7580
Change-Id: I92cd1c4193e9e8920f28f3300d28bdc8bb6b04cd
sreevanis [Thu, 9 Jun 2016 02:23:30 +0000 (02:23 +0000)]
Merge \"docs: Documented how to handle alarms in AA media apps.\" into mnc-io-docs
am:
21d6abf7be
Change-Id: Id05d99983414d3884c0c90fb67eec224ca77c80b
Sreevani Sreejith [Thu, 9 Jun 2016 02:15:38 +0000 (02:15 +0000)]
Merge "docs: Documented how to handle alarms in AA media apps." into mnc-io-docs
sreevanis [Fri, 3 Jun 2016 19:43:52 +0000 (12:43 -0700)]
docs: Documented how to handle alarms in AA media apps.
Bug:
27708785
Change-Id: Iee2a676fd8adbcba00301932d5e5637ee21df224
TreeHugger Robot [Thu, 9 Jun 2016 01:38:31 +0000 (01:38 +0000)]
Merge "Always re-enable keyguard state when the user switches." into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 00:28:52 +0000 (00:28 +0000)]
Merge "Revert "Temporarily increase timeout for devices with buggy driver"" into nyc-dev
Adam Lesinski [Thu, 9 Jun 2016 00:19:09 +0000 (17:19 -0700)]
Throw proper exception in ResourcesManager
In M we would bubble up a NameNotFoundException when failing
to load an assetmanager from another application. We switched
to throwing an IllegalArgumentException, which isn't something
anyone should handle.
This change has ResourcesManager throw Resources.NotFoundException,
which callers like ApplicationPackageManager can catch and rethrow
with the appropriate checked exception. This adds more detail to
errors than we had in M.
Bug:
28876344
Change-Id: I250aeef8a4ccfd90c6abef2243edc1c5337ebde9
fionaxu [Wed, 8 Jun 2016 23:05:56 +0000 (16:05 -0700)]
resolve merge conflicts of
afed6f8 to nyc-dev
Bug:
28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac
Winson [Wed, 8 Jun 2016 19:57:40 +0000 (12:57 -0700)]
Forcing software in header button background ripples.
Bug:
29133575
Change-Id: I21125e28208335f5b2c2adf06cb1c8199b3ca476
TreeHugger Robot [Wed, 8 Jun 2016 22:49:23 +0000 (22:49 +0000)]
Merge "Consume the first sample of KernelUidCpuTimeReader" into nyc-dev
Eric Schmidt [Tue, 31 May 2016 20:26:25 +0000 (13:26 -0700)]
docs: Added links to performance resources section
Bug:
27925680
Change-Id: Ide169d8f1b182cb1ed0021c35f2eee51feac71d7
Svetoslav Ganov [Wed, 8 Jun 2016 21:54:39 +0000 (21:54 +0000)]
Merge "Teach persistable Uri grants about direct boot" into nyc-dev
Adam Lesinski [Wed, 8 Jun 2016 21:19:09 +0000 (14:19 -0700)]
Consume the first sample of KernelUidCpuTimeReader
If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.
Bug:
29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc
Adarsh Fernando [Wed, 8 Jun 2016 21:18:02 +0000 (21:18 +0000)]
AS UI redirect for experimental to stable Gradle migration guide am:
c65f7e8071
am:
28f355bb63
Change-Id: I5efe04ef8a2c7c3d7a226ee91beca0f89e48be37
Adarsh Fernando [Wed, 8 Jun 2016 21:12:56 +0000 (21:12 +0000)]
AS UI redirect for experimental to stable Gradle migration guide
am:
c65f7e8071
Change-Id: I6ebb598650756de2687b4ab73ef41e27b13c8b1c
Adarsh Fernando [Wed, 8 Jun 2016 20:42:37 +0000 (13:42 -0700)]
AS UI redirect for experimental to stable Gradle migration guide
- This guide may be moved over to DAC when AS 2.2 goes stable.
Change-Id: Ia29bb75832f01efc8175db45f8fd08d5013d715e
Adrian Roos [Wed, 8 Jun 2016 20:24:59 +0000 (20:24 +0000)]
Merge "Direct Reply: Add back emoji button" into nyc-dev
David Sehr [Wed, 8 Jun 2016 17:37:33 +0000 (10:37 -0700)]
Simplify code paths computation, allow adb root to dump
Bug:
28748264
Change-Id: I1aefa5d98e80b58d6ed500c5d2d610569cf25c3a