OSDN Git Service
Jason Monk [Mon, 18 Jan 2016 14:21:45 +0000 (09:21 -0500)]
Add zen panel to volume dialog again in tuner
Change-Id: Ie74a6bd8ecd7f2d8b16e96cc0087e63796d5f9a2
Thierry Strudel [Sat, 16 Jan 2016 02:28:30 +0000 (02:28 +0000)]
Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev am:
fc7e682f44 am:
f4dd31755a
am:
3b6c965570
* commit '
3b6c965570e5f4f54a78a6478bac40a355c6b372':
Supply content description for QS disconnect buttons
Daniel Sandler [Sat, 16 Jan 2016 02:26:53 +0000 (02:26 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev am:
76f28bbd64 am:
3be84505f4
am:
8afab95aa9
* commit '
8afab95aa976cc1d07ee307df9fa85f505ba800c':
Stop leaking Notifications when they change groupKeys.
Dan Albert [Sat, 16 Jan 2016 02:25:22 +0000 (02:25 +0000)]
Merge "Make the appropriate cast to protect from mingw." am:
dbf8c17bd2
am:
2edfa8c9b0
* commit '
2edfa8c9b00cd0c0bd18738f75e0928394b99c76':
Make the appropriate cast to protect from mingw.
Suprabh Shukla [Sat, 16 Jan 2016 02:00:00 +0000 (02:00 +0000)]
Merge "Keeping only running users recents in memory"
Suprabh Shukla [Wed, 2 Dec 2015 22:36:31 +0000 (14:36 -0800)]
Keeping only running users recents in memory
Currently, all the users' recent tasks are loaded into memory and kept
in sync with the persistent storage. This changes the system so
that it loads a users recents into memory lazily (i.e. when
getRecentTasks is called for that user) and unloads them from the
memory as soon as the user is stopped. This also required bucketizing
the taskIds per user, so that the next available taskId can be assigned
without having knowledge of all the tasks that are stored away in
persistent storage but are not available in memory.
Bug-Id: b/
24569398
Change-Id: Ia5cb64d9f4ee727225dce34e45ca63e946ac27a8
Amith Yamasani [Mon, 7 Dec 2015 22:19:49 +0000 (14:19 -0800)]
User creation with an intent
New API for an app to request creating a new user with
a given user name and seed account information for the
SetupWizard to use when that user is switched into.
Also adds system APIs to read the seed account data from
UserManager.
Bug:
22776757
Change-Id: I0bc3f11ee19c15e0ee2a908c88d98b13296cc30d
Jeff Sharkey [Sat, 16 Jan 2016 00:41:08 +0000 (00:41 +0000)]
Merge "Prepare app data only when storage is available."
Brad Ebinger [Sat, 16 Jan 2016 00:24:43 +0000 (00:24 +0000)]
Merge "Refactoring and cleanup"
Anthony Chen [Sat, 16 Jan 2016 00:23:57 +0000 (00:23 +0000)]
Merge "Separate notification area into own controller."
Jorim Jaggi [Sat, 16 Jan 2016 00:21:18 +0000 (00:21 +0000)]
Merge "Fix build"
Jorim Jaggi [Sat, 16 Jan 2016 00:18:30 +0000 (16:18 -0800)]
Fix build
Change-Id: I6d4bebf90c11a4a00d259aac34bb9459d973da9b
Wale Ogunwale [Fri, 15 Jan 2016 23:55:10 +0000 (23:55 +0000)]
Merge "Don't mark wallpaper windows as visible when it's surface is hidden."
Wale Ogunwale [Fri, 15 Jan 2016 23:55:04 +0000 (23:55 +0000)]
Merge "Fix split-screen visible apps issue when screen is rotated on lockscreen"
Thierry Strudel [Fri, 15 Jan 2016 23:51:19 +0000 (23:51 +0000)]
Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev am:
fc7e682f44
am:
f4dd31755a
* commit '
f4dd31755a31a2eea6e363a1ab45a4a8634e27ed':
Supply content description for QS disconnect buttons
Anthony Chen [Tue, 12 Jan 2016 01:00:36 +0000 (17:00 -0800)]
Separate notification area into own controller.
Extracts the notification area of the status bar into a layout file and
create a NotificationAreaController that controls what happens in this
area.
This is to allow this area to be configurable in Android Auto Embedded
cases where OEMs may want their own custom implementations here.
Change-Id: I8a52af676d16fd6f7d3878805970a5897d2db945
Thierry Strudel [Fri, 15 Jan 2016 23:47:53 +0000 (23:47 +0000)]
Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev
am:
fc7e682f44
* commit '
fc7e682f445fbf358e59205912229b63c5fadda4':
Supply content description for QS disconnect buttons
Thierry Strudel [Fri, 15 Jan 2016 23:44:45 +0000 (23:44 +0000)]
Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev
Mikhail Naganov [Fri, 15 Jan 2016 23:44:23 +0000 (23:44 +0000)]
Merge "Mark Context.BIND_EXTERNAL_SERVICE as SystemApi"
Youngsang Cho [Fri, 15 Jan 2016 23:39:14 +0000 (23:39 +0000)]
Merge "Initial check-in of picture-in-picture system-ui"
Wale Ogunwale [Fri, 15 Jan 2016 23:00:57 +0000 (15:00 -0800)]
Don't mark wallpaper windows as visible when it's surface is hidden.
Also, cleaned up the visibility methods a little.
Bug:
26440195
Change-Id: I27451e980b437f6c4e1e5488d8ada42312a113bb
Youngsang Cho [Thu, 17 Dec 2015 21:39:39 +0000 (13:39 -0800)]
Initial check-in of picture-in-picture system-ui
Bug:
26549507
Change-Id: I6c69b5e2b5492858fc997657b5a06d3e50ca16e3
Shreyas Basarge [Fri, 15 Jan 2016 23:12:15 +0000 (23:12 +0000)]
Merge "Adds sourcePackageName field to JobStatus"
Paul Mclean [Fri, 15 Jan 2016 23:07:39 +0000 (23:07 +0000)]
Merge "Native Audio Routing and (Java) AudioRouting (interface)."
Jeff Sharkey [Thu, 14 Jan 2016 01:52:55 +0000 (18:52 -0700)]
Prepare app data only when storage is available.
Before this change, scanning a package aggressively tried checking
to ensure that private app data was prepared. However, in an FBE
world we may not have access to that data at scan time. So this
change shifts the preparing of private app data until later: it
prepares DE storage when a user is started, and CE storage when a
user is unlocked. Wire ourselves into the user lifecycle so we can
prepare storage at both user start and unlock.
When DE/CE storage becomes available, this change reconciles any
found packages against known installed apps, and deletes any orphaned
data directories.
We now need to store the last-restorecon hash in an xattr on a
per-user directory basis, since we can't restorecon CE storage until
it's unlocked, or adopted storage until it's mounted. Remove a
bunch of used logic for loading dynamic SELinux policy at runtime;
our policy always comes from the system image.
Bug:
26466827,
26544104
Change-Id: I8d0a4ef862c35f4e4ef5c7f20d3bb8f12ba3fd4b
Paul McLean [Wed, 2 Dec 2015 22:04:17 +0000 (15:04 -0700)]
Native Audio Routing and (Java) AudioRouting (interface).
Adding AudioRouting (Java) interface for routing control
in AudioTrack and AudioRecord.
Deprecating current (Marshmallow) Routing APIs in
AudioTrack and AudioRecord.
Adding package-private constructors to AudioTrack and AudioRecord
to connect to native player/recorder.
Bug:
23899814
Change-Id: I7df7a687fbd56a34c1f5769ffe005eba2a059505
Shreyas Basarge [Mon, 11 Jan 2016 23:09:26 +0000 (23:09 +0000)]
Adds sourcePackageName field to JobStatus
Platform apps can schedule a job on behalf of
some other package. Battery stats and appIdleState
will be computed using sourcePackageName.
Change-Id: If52f6e1db3a563ef0854d1f59fbc6088a0c29ad1
Jorim Jaggi [Fri, 15 Jan 2016 22:40:49 +0000 (22:40 +0000)]
Merge changes I0b8b2ee3,Ib71f8f77,Ica481295,Iaf871389,Iab9a445d
* changes:
Restrict drag in gesture to recents button
Fix flickering while dismissing docked stack
More optimization while dragging docked divider
Don't relayout when windows move during resize
Optimize window relayouts when dragging divider
Wale Ogunwale [Fri, 15 Jan 2016 22:37:12 +0000 (22:37 +0000)]
Merge "Allow AMS.moveTasksToFullscreenStack moving tasks onTop"
Jorim Jaggi [Fri, 15 Jan 2016 03:40:24 +0000 (19:40 -0800)]
Restrict drag in gesture to recents button
Bug:
26317834
Change-Id: I0b8b2ee3b552b979c22b2135056c9899273886a0
Jorim Jaggi [Fri, 15 Jan 2016 02:57:55 +0000 (18:57 -0800)]
Fix flickering while dismissing docked stack
Make sure the docked stack is at least 1 px wide/high, or else
activity manager will think the bounds are empty and thus assume
fullscreen.
Change-Id: Ib71f8f77f4f594057ecf016914f1e6ea88995597
Jorim Jaggi [Fri, 15 Jan 2016 01:36:55 +0000 (17:36 -0800)]
More optimization while dragging docked divider
- Make sure mPendingBackdropFrame gets also set when if the window
triggers a relayout on it's own, so it doesn't call into window manager
all the time.
- Set the insets of the docked divider to empty so we don't trigger a
layout when we are just moving it - it doesn't need it in any case.
- Send a window move message to the divider when it moved
- Update attach info in all move cases, update light center
The whole resize operation now only takes around 4ms per frame, and
leaves a lot more resources for the apps to do configuration changes.
Bug:
25015474
Change-Id: Ica48129570a0fc858a89c21f46abf3442efb0224
Jorim Jaggi [Thu, 14 Jan 2016 01:39:25 +0000 (17:39 -0800)]
Don't relayout when windows move during resize
Not needed and just increases system load.
Bug:
25015474
Change-Id: Iaf871389527237b5cbc88c03b2f060629b6351dc
Jorim Jaggi [Thu, 7 Jan 2016 16:39:12 +0000 (17:39 +0100)]
Optimize window relayouts when dragging divider
- Communicate the resize mode to ViewRootImpl. If it is a docked
divider resize, do not call relayout for every traversal.
- Do not call Task.resizeWindows() unconditionally when changing
Stack bounds. It might be just a move.
- However, not calling relayout breaks layout bounds while
relaunching. To fix that, do the following:
-- Inform ViewRootImpl that the activity just relaunched, and force
a relayout call in the next traversal so the client can pick up
the unfrozen bounds.
-- When unfreezing the bounds, cause a traversal in window manager.
Bug:
25015474
Change-Id: Iab9a445dabce4f6ec1e25957038fe40a4be65246
Hall Liu [Fri, 15 Jan 2016 22:28:09 +0000 (22:28 +0000)]
Merge "Add method to dump Telecom analytics"
John Reck [Fri, 15 Jan 2016 22:11:11 +0000 (22:11 +0000)]
Merge "Revert "Revert "Fix leak in unclipped save layer"""
John Reck [Fri, 15 Jan 2016 21:17:09 +0000 (13:17 -0800)]
Revert "Revert "Fix leak in unclipped save layer""
This reverts commit
a6fc36d4cd7f27147fd304960acdd1d2f47fc1c6.
Change-Id: I6b96afe4a32dc894d5b17cfb870b45063257aed2
Yohei Yukawa [Fri, 15 Jan 2016 21:46:36 +0000 (21:46 +0000)]
Merge "Replace Locale with LocaleList in LocaleSpan."
Daniel Sandler [Fri, 15 Jan 2016 21:18:20 +0000 (21:18 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev am:
76f28bbd64
am:
3be84505f4
* commit '
3be84505f41e58125b4449f0506d518bd2f1ae95':
Stop leaking Notifications when they change groupKeys.
Yohei Yukawa [Fri, 15 Jan 2016 21:14:03 +0000 (13:14 -0800)]
Replace Locale with LocaleList in LocaleSpan.
This is a straightforward upgrading of LocaleSpan.
LocaleSpan was designed to be a mechanism to override text locale only
in a certain substring. Since now text locale supports multiple locales
with LocaleList, it should make sense to let LocaleSpan have the ability
to have multiple locales with LocaleList.
This CL also addresses an existing issue that LocaleSpan maintained only
Language/Country/Variant tags. Now Locale data associated with a
LocaleSpan is guaranteed to be preserved as long as each of them can be
created from a BCP 47 language tag with Locale#forLanguageTag(String).
Bug:
26567158
Change-Id: Ib754796d399cd00f9d02005df88874a5cd5c7642
Daniel Sandler [Fri, 15 Jan 2016 21:14:01 +0000 (21:14 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev
am:
76f28bbd64
* commit '
76f28bbd64a6841a91d4890d7a248411fd95b149':
Stop leaking Notifications when they change groupKeys.
Selim Gurun [Fri, 15 Jan 2016 21:11:07 +0000 (21:11 +0000)]
Merge "Revert "Revert "Add the TokenBindingManager"""
Selim Gurun [Fri, 15 Jan 2016 21:10:52 +0000 (21:10 +0000)]
Revert "Revert "Add the TokenBindingManager""
This reverts commit
d1ec6356b346a4f420623fd035802065924bc164.
Change-Id: I75e4d9226808a30532f5c593123e59b78cd1e761
Daniel Sandler [Fri, 15 Jan 2016 21:05:41 +0000 (21:05 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev
Dan Albert [Fri, 15 Jan 2016 21:02:29 +0000 (21:02 +0000)]
Merge "Make the appropriate cast to protect from mingw."
am:
dbf8c17bd2
* commit '
dbf8c17bd20c3c5b4ba99242afa8b714841914d1':
Make the appropriate cast to protect from mingw.
Selim Gurun [Fri, 15 Jan 2016 21:01:31 +0000 (21:01 +0000)]
Merge "Revert "Add the TokenBindingManager""
Hall Liu [Tue, 12 Jan 2016 23:32:58 +0000 (15:32 -0800)]
Add method to dump Telecom analytics
Add dumpAnalytics in TelecomManager to allow the connectivity stats
service to access Telecom analytics for uploading.
Change-Id: I197d6af340fac7f38b28bb44a476b5e694db4dba
Dan Albert [Fri, 15 Jan 2016 20:41:23 +0000 (20:41 +0000)]
Merge "Make the appropriate cast to protect from mingw."
Selim Gurun [Fri, 15 Jan 2016 20:34:02 +0000 (20:34 +0000)]
Revert "Add the TokenBindingManager"
This reverts commit
57eb3264c9735953176f9bb0c14874f65cee85af.
Change-Id: Ie74b64a181eb08dbfa1aeca99322be377e9f1d9c
Julia Reynolds [Fri, 15 Jan 2016 20:21:21 +0000 (20:21 +0000)]
Merge "Prevent users from blocking certain system notifications."
Dan Albert [Fri, 15 Jan 2016 20:16:06 +0000 (12:16 -0800)]
Make the appropriate cast to protect from mingw.
As the comment at the top of the file says:
STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum
value, so a cast is necessary.
Bug: http://b/
26523949
Change-Id: I9d86cafdc47bbb9ce0e967cdde9315babc083432
Winson [Fri, 15 Jan 2016 01:16:06 +0000 (17:16 -0800)]
Preventing dock target from showing for single tasks.
Change-Id: I2a73c085e3777ac79f2846e1ba59f7c65bc3f9d0
Yao Chen [Fri, 15 Jan 2016 20:09:11 +0000 (20:09 +0000)]
Merge "Changes in DeviceIdlecontroller and JobScheduler to support Auto GarageMode."
Yao Chen [Wed, 13 Jan 2016 22:44:36 +0000 (14:44 -0800)]
Changes in DeviceIdlecontroller and JobScheduler to support Auto GarageMode.
Changes made in the cl:
1. Let DeviceIdleController take listeners on whether background
maintanence services are active. This currently includes JobScheduler,
SyncManager, DownloadService. Note this is the last known
states reported by these services.
2. In JobScheduler, make the idle threshold and alarm window configurable.
So in the car case, we don't need to wait 71 mins after screen off
to kick off any jobs that require device idle.
-------------------------------------------------------------------
* We are not going to suppress JobScheduler, DownloadService, SyncManager
entirely while user is driving. Because apps may not be working properly if
these services are suspended.
* The jobs that we don't allow to run while driving are the
jobs submitted to JobScheduler that require device idle.
And this is already taken care of, because
screen is ON and JobScheduler will not consider the device to be idle
while driving (unless user turns off the head unit).
* We will need to give the JobScheduler a chance to run the device idle
jobs when car is turned off. This is the scope of GarageMode. If
DownloadService and SyncManager want to run, we will allow them to run
too.
* The headunit is treated as wall power device, so it's always charging.
The charging state will not toggle.
Change-Id: I55b92cf92efd61c48dd6c9b8197c2b68078a4439
Victor Chan [Fri, 15 Jan 2016 20:03:31 +0000 (20:03 +0000)]
Merge "Highlight car nav facet when recent task changes."
Victor Chan [Sun, 10 Jan 2016 00:26:37 +0000 (16:26 -0800)]
Highlight car nav facet when recent task changes.
CarStatusBar will now register a ITaskStackListener
to handle changes in task stack and highlight the
appropriate facet for the current task. Currently using resource
defined package names and category to the filter for a given
facet. OEMs are expected to use categories definied in Intent.java
Also refactored business logic from CarNavigationBarView
into CarNavigationBar controller.
Change-Id: I203917ea43f2f488a1167f27dab84f1c451b3e93
Julia Reynolds [Fri, 15 Jan 2016 20:00:02 +0000 (15:00 -0500)]
Prevent users from blocking certain system notifications.
Bug:
26575595
Change-Id: I0c890852a441085fffab143a590a12fbd7f2b2a3
Youngsang Cho [Fri, 15 Jan 2016 19:56:55 +0000 (19:56 +0000)]
Merge "PIP: Use long press HOME for PIP on Android TV (2/2)"
Mikhail Naganov [Fri, 15 Jan 2016 02:04:58 +0000 (18:04 -0800)]
Mark Context.BIND_EXTERNAL_SERVICE as SystemApi
This way, it can be used in WebView's Chromium code.
Bug:
22084679
Bug:
21643067
Change-Id: Ia34f08857d02876f94b24df79c46212d34b01036
Alan Viverette [Fri, 15 Jan 2016 19:19:38 +0000 (19:19 +0000)]
Merge "Don't set date picker dialog title on date changed"
Selim Gurun [Fri, 15 Jan 2016 19:08:49 +0000 (19:08 +0000)]
Merge "Add the TokenBindingManager"
Alan Viverette [Fri, 15 Jan 2016 19:04:40 +0000 (19:04 +0000)]
Merge "Remove delay before performing drop down item click"
Christopher Tate [Tue, 15 Sep 2015 23:43:07 +0000 (16:43 -0700)]
Back up / restore runtime permission grants
Only user-originated grant actions are backed up/restored. This
includes outright grants, one-time denials, and "never ask again"
type denials.
Bug
19870549
Change-Id: I78b4a8abb713dc5d74b93cb53217b212d57b26e4
Aga Wronska [Fri, 15 Jan 2016 18:30:53 +0000 (18:30 +0000)]
Merge "Add Search View UI tests"
Chong Zhang [Fri, 15 Jan 2016 18:24:09 +0000 (18:24 +0000)]
Merge "Fix missing dialog windows"
Adam Lesinski [Fri, 15 Jan 2016 18:23:33 +0000 (18:23 +0000)]
Merge "Fix FeatureSplit tests to work properly with Java code"
Richard Uhler [Fri, 15 Jan 2016 18:23:29 +0000 (18:23 +0000)]
Merge "Use NativeAllocationRegistry for Paint, Canvas, and Bitmap"
Wale Ogunwale [Fri, 15 Jan 2016 16:56:11 +0000 (08:56 -0800)]
Allow AMS.moveTasksToFullscreenStack moving tasks onTop
Bug:
26573473
Change-Id: I4517ac2b3e803637971c329be2511ba66412d815
Selim Gurun [Tue, 29 Dec 2015 23:11:28 +0000 (15:11 -0800)]
Add the TokenBindingManager
Bug:
22665752
Add the webview APIs to manage token binding protocol keys.
Change-Id: Ie2eae543869b1ae91cdb4e70217c28b9a8a465cf
Ian Pedowitz [Fri, 15 Jan 2016 17:51:25 +0000 (17:51 +0000)]
Merge "Fix crash in KeyguardManager.isDeviceLocked"
Aga Wronska [Thu, 14 Jan 2016 19:15:20 +0000 (11:15 -0800)]
Add Search View UI tests
Change-Id: I67726e7764ec147c5987cbf737f763c3146f5766
Xiyuan Xia [Fri, 15 Jan 2016 17:31:32 +0000 (17:31 +0000)]
Merge "Refactoring for better extendability"
Sudheer Shanka [Fri, 15 Jan 2016 17:30:07 +0000 (17:30 +0000)]
Merge "Add permission MANAGE_PROFILE_AND_DEVICE_OWNERS."
Jaewan Kim [Thu, 14 Jan 2016 09:01:52 +0000 (18:01 +0900)]
PIP: Use long press HOME for PIP on Android TV (2/2)
Bug:
25580820
Change-Id: Ic269132ec7de1e725989ad57a1ee205b3334e3bb
Sudheer Shanka [Fri, 15 Jan 2016 17:20:55 +0000 (17:20 +0000)]
Add permission MANAGE_PROFILE_AND_DEVICE_OWNERS.
It is required to query getUserRestrictions from DevicePolicyManager.
Change-Id: I5218f8cbe225ddd9ed8a74db94133bda5b571cc3
Neil Fuller [Fri, 15 Jan 2016 17:06:49 +0000 (17:06 +0000)]
Merge "Add thread safety documentation" am:
b3ea05a56e
am:
f19a33a070
* commit '
f19a33a0704d0e605c0a5206fe5df3ab7dbf6864':
Add thread safety documentation
Clara Bayarri [Fri, 15 Jan 2016 16:57:35 +0000 (16:57 +0000)]
Fix crash in KeyguardManager.isDeviceLocked
A missing clearCallingIdentity was causing crashes when
isDeviceLocked is queried.
Bug:
26576080
Change-Id: I2d78e803873a02861335a95b1bbf13a4d9b45655
Neil Fuller [Fri, 15 Jan 2016 16:57:03 +0000 (16:57 +0000)]
Merge "resolve merge conflicts of
69c2907c63 to "
Neil Fuller [Fri, 15 Jan 2016 16:55:48 +0000 (16:55 +0000)]
resolve merge conflicts of
69c2907c63 to master.
Change-Id: I0aba5f7715ac1d25ef233fe4fdad794e8847bed9
Julia Reynolds [Fri, 15 Jan 2016 16:43:57 +0000 (16:43 +0000)]
Merge changes I1149cb5b,Ib89a17aa
* changes:
Allow condition providers to specify a rule instance limit.
Verify zen rule owners before persisting rules.
Trevor Bunker [Fri, 8 Jan 2016 19:11:13 +0000 (11:11 -0800)]
Define TYPE_DEVICE_ORIENTATION
Bug:
23470411
Change-Id: Iceba2656936525c655f23fb00bb77521c432ba6a
Philip P. Moltmann [Fri, 15 Jan 2016 16:38:17 +0000 (16:38 +0000)]
Merge "Enforce non-nullness in PrinterId and exploit it."
Derek Sollenberger [Fri, 15 Jan 2016 16:37:11 +0000 (16:37 +0000)]
Merge "Restore old behavior of setLocalMatrix"
Neil Fuller [Fri, 15 Jan 2016 16:36:34 +0000 (16:36 +0000)]
Merge "Add thread safety documentation"
am:
b3ea05a56e
* commit '
b3ea05a56ea980541d328ab7534a2da230d62c06':
Add thread safety documentation
Neil Fuller [Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)]
Merge "Fix @code escapes"
am:
b0d92f4717
* commit '
b0d92f4717af4e4736dc80b2a822dae8e5a52587':
Fix @code escapes
Neil Fuller [Fri, 15 Jan 2016 16:27:16 +0000 (16:27 +0000)]
Merge "Add thread safety documentation"
Neil Fuller [Tue, 24 Nov 2015 18:19:06 +0000 (18:19 +0000)]
Add thread safety documentation
An upcoming change will remove "synchronized" from the API docs. This change
documents those cases where the guarantees can be determined from code
inspection.
Bug:
25767152
(cherry-picked from commit
bf0dc0fba790cf95f76870c37469703f8f20a57c)
Change-Id: I328b96328e89950b90d537bf0a6a704242de4993
Neil Fuller [Fri, 15 Jan 2016 16:22:16 +0000 (16:22 +0000)]
Merge "Fix @code escapes"
Neil Fuller [Mon, 30 Nov 2015 09:51:33 +0000 (09:51 +0000)]
Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.
Bug:
25757239
(cherry-picked from commit
71fbb81b14958b80fe55738607740c6630e4e9da)
Change-Id: I19dafddc6501be6fee362c396ac5bbdc934ae39d
Leon Scroggins III [Thu, 14 Jan 2016 22:18:54 +0000 (17:18 -0500)]
Restore old behavior of setLocalMatrix
We updated the API of SkShader (changed in
https://codereview.chromium.org/
1553743002) but the function still does
the same thing. As such, undo the changes in
f4eca05cdc19c095cdc0a9140d512737533a87c5 which call the method
differently.
BUG:
26549769
This partially reverts commit
f4eca05cdc19c095cdc0a9140d512737533a87c5.
Change-Id: I52f2fab7da748cfe351e2fa27ade24aa572176a7
Clara Bayarri [Fri, 15 Jan 2016 16:00:45 +0000 (16:00 +0000)]
Merge "Protect TrustManager.setDeviceLockedForUser with permission"
Clara Bayarri [Fri, 15 Jan 2016 15:57:46 +0000 (15:57 +0000)]
Merge "Fix Device policy crashes after adding the account while checking isActivePasswordSufficient"
Julia Reynolds [Thu, 14 Jan 2016 20:05:34 +0000 (15:05 -0500)]
Allow condition providers to specify a rule instance limit.
Bug:
25563007
Change-Id: I1149cb5be59668f8869c81cb46c5ead49aec933a
Dan Sandler [Thu, 14 Jan 2016 20:49:36 +0000 (15:49 -0500)]
Stop leaking Notifications when they change groupKeys.
If a Notification changes groups (either from one group to
another, or gets a group key for the first time, which takes
it out of its implicit singleton group) it should be removed
from the old group in NotificationGroupManager's mGroupMap
and re-inserted under the new one.
Unfortunately we were passing the *new* notification in the
oldNotification argument, so we would always attempt (and
fail) to remove it from the *new* group, leaving a strong
reference to the Notification inside mGroupMap under an
obsolete group key.
Bug:
26561365
Change-Id: Ie5cdceb4f843dbd363652e00fbc0f3ac6f6ef247
Clara Bayarri [Wed, 13 Jan 2016 16:17:09 +0000 (16:17 +0000)]
Protect TrustManager.setDeviceLockedForUser with permission
Bug:
26535793
Change-Id: I172f1ec7d9285213ecd70564728c7328a3a675ff
Clara Bayarri [Fri, 15 Jan 2016 15:17:52 +0000 (15:17 +0000)]
Fix Device policy crashes after adding the account while checking isActivePasswordSufficient
The calls to LockPatternUtils#isSeparateProfileChallengeEnabled
require MANAGE_USERS permission, wrapped them in a clear identity
Bug:
26565169
Change-Id: I4a18cec3ae7beb13320350d4c3fdc63e4a7d741d
Benjamin Franz [Fri, 15 Jan 2016 14:04:00 +0000 (14:04 +0000)]
Merge "Introduce new intent action to set parent challenge"
Shreyas Basarge [Fri, 15 Jan 2016 13:54:08 +0000 (13:54 +0000)]
Merge "Added priority to JobScheduler scheduling"
Benjamin Franz [Fri, 8 Jan 2016 17:17:44 +0000 (17:17 +0000)]
Introduce new intent action to set parent challenge
Introduce a new intent action that triggers setting of the challenge of
the parent user. The existing intent action is repurposed to always
trigger setting the challenge of the calling user.
Change-Id: Ia7afe268b2de95537bed5bbb57163fd23bb55b6a
Daichi Hirono [Fri, 15 Jan 2016 07:59:52 +0000 (07:59 +0000)]
Merge "Fix compile error introduced by ag/842950."