230087 Commits

Author SHA1 Message Date
Neil Fuller
69c2907c63 Merge "Fix @code escapes"
am: b0d92f4717

* commit 'b0d92f4717af4e4736dc80b2a822dae8e5a52587':
  Fix @code escapes
2016-01-15 16:31:40 +00:00
Neil Fuller
b3ea05a56e Merge "Add thread safety documentation" 2016-01-15 16:27:16 +00:00
Neil Fuller
2c9d40a06e 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
2016-01-15 16:26:26 +00:00
Neil Fuller
b0d92f4717 Merge "Fix @code escapes" 2016-01-15 16:22:16 +00:00
Neil Fuller
9498e8a8d2 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
2016-01-15 16:14:57 +00:00
Leon Scroggins III
c95d2d1bd6 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
2016-01-15 11:07:23 -05:00
Clara Bayarri
4bfa55d4c2 Merge "Protect TrustManager.setDeviceLockedForUser with permission" 2016-01-15 16:00:45 +00:00
Clara Bayarri
6dfcf14a2f Merge "Fix Device policy crashes after adding the account while checking isActivePasswordSufficient" 2016-01-15 15:57:46 +00:00
Sudheer Shanka
7664cbac35 Add an util method and update setMenuItemAsDisabledByAdmin.
Added an utility method checkIfUninstallBlocked in
RestrictedLockUtils. Also updated setMenuItemAsDisabledByAdmin
to be able to remove the added padlock and color spans.

Change-Id: I7874f7097d09bc9ab127307f2a8a03a20560347c
2016-01-15 15:47:19 +00:00
Julia Reynolds
43b70cdc39 Allow condition providers to specify a rule instance limit.
Bug: 25563007
Change-Id: I1149cb5be59668f8869c81cb46c5ead49aec933a
2016-01-15 10:30:17 -05:00
Dan Sandler
24813b0dd5 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
2016-01-15 10:29:31 -05:00
Clara Bayarri
00a9b89085 Protect TrustManager.setDeviceLockedForUser with permission
Bug: 26535793
Change-Id: I172f1ec7d9285213ecd70564728c7328a3a675ff
2016-01-15 15:19:36 +00:00
Clara Bayarri
206747d9f6 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
2016-01-15 15:19:35 +00:00
Benjamin Franz
d5002c1244 Merge "Introduce new intent action to set parent challenge" 2016-01-15 14:04:00 +00:00
Shreyas Basarge
17971e383f Merge "Added priority to JobScheduler scheduling" 2016-01-15 13:54:08 +00:00
Gustav Sennton
1c7e9ff4a7 Change API for killing app-depentents to also kill main app.
In the case where we switch WebView provider we also want to kill the
provider itself in the cases where we want to kill its dependents. This
so that the provider's processes are consistently loading code in the
same way (i.e. either all processes use the webview implementation, or
none of them do).

Bug: 25338573

Change-Id: I2baf7ce1204fb6312a6ad10fa006b789c8ece176
2016-01-15 12:44:58 +00:00
Benjamin Franz
c992109885 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
2016-01-15 11:39:16 +00:00
Daichi Hirono
8414c671bd Merge "Fix compile error introduced by ag/842950." 2016-01-15 07:59:52 +00:00
Daichi Hirono
fab4a97a79 Fix compile error introduced by ag/842950.
BUG=25756419

Change-Id: I8ac270946b3915c02b21a07cf0a9c5b62d69effc
2016-01-15 16:54:24 +09:00
Daichi Hirono
111490a8e4 Merge "Fix AppFuse JNI." 2016-01-15 06:08:36 +00:00
Deepanshu Gupta
15cc7bba8d Merge "Fix custom font rendering" into mnc-ub-dev am: f5984d5fce
am: 14df39f9e5

* commit '14df39f9e5855caef8d272fb136abe17b225d971':
  Fix custom font rendering
2016-01-15 05:29:10 +00:00
Daichi Hirono
2153e822ee Fix AppFuse JNI.
* Return attributes for all files as well as root.
 * Fix buffer size for reading and add a check for reading size.

BUG=25756419

Change-Id: I572f718bc01d96616ec94f85d800b8b57eedd2ea
2016-01-15 13:45:47 +09:00
Vinit Deshpande
02bb4295f0 Allow turning off Wi-Fi when emergency call is made
am: 19ec617fd5

* commit '19ec617fd531978f83080758226bd3245c82ec29':
  Allow turning off Wi-Fi when emergency call is made
2016-01-15 03:19:08 +00:00
Daniel Chapin
431d40cf5f Merge "Revert "Fix leak in unclipped save layer"" 2016-01-15 03:05:44 +00:00
Daniel Chapin
a6fc36d4cd Revert "Fix leak in unclipped save layer"
This reverts commit 8e068d5fd38dd103a122215fb6d185135182edf3.

Change-Id: Icd8ad5a2450db34aacecf748d6103df9faaa4c81
2016-01-15 03:02:58 +00:00
Wale Ogunwale
ccb6ce2dcd Fix split-screen visible apps issue when screen is rotated on lockscreen
When the keyguard is showing we say the docked stack is invisible so that
any activity that displays on top of the keyguard isn't cropped by the
docked stack. However this causes issues when the docked stack is resized
due to orientation change while the keyguard is showing.
We now ignore the visibility state of the docked stack when trying to get
bounds information for resizing while the keyguard is showing.

Bug: 25970565
Change-Id: I7479a1d0afed3b2edfb17848c56c5c3902b3709e
2016-01-14 18:24:30 -08:00
Filip Gruszczynski
3ca8b122fc Merge "Fix visible-behind not visible for translucent activity in fullscreen stack." 2016-01-15 02:13:52 +00:00
Chong Zhang
f6525ceebc Fix missing dialog windows
Use the size in the configuration (not the display size) to set the
dialog size.

bug: 26490549
Change-Id: I8e17482ddcc39fae1d6fd7b0a8e1954b21dac5c8
2016-01-14 17:30:22 -08:00
Etan Cohen
3da7357951 Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev
am: e540b64aaf

* commit 'e540b64aaf58460f7930a5e4937cee660215c948':
  NAN: baseline NAN manager for discovery.
2016-01-15 01:29:48 +00:00
Vinit Deshpande
19ec617fd5 Allow turning off Wi-Fi when emergency call is made
Bug: 24147407
Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
2016-01-14 17:24:39 -08:00
Yohei Yukawa
f1fc5a0fe8 Merge changes Ib5ea8131,I571d6cc9
* changes:
  Add a new API IMM#dispatchKeyEventFromInputMethod().
  BaseInputConnection shouldn't rely on @hide APIs.
2016-01-15 01:23:09 +00:00
Filip Gruszczynski
0e381e278a Fix visible-behind not visible for translucent activity in fullscreen stack.
Bug: 26471802
Change-Id: Ide9945c4478805902ca0df92dc2043359a751600
2016-01-14 17:22:06 -08:00
Etan Cohen
e540b64aaf Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev 2016-01-15 01:17:08 +00:00
Neil Fuller
063955c69d Merge "Hide static setDefault methods in ICU4J" am: 9e892f53dd
am: 79ebcde07b

* commit '79ebcde07b80dd735e1122a8d219da4112954a75':
  Hide static setDefault methods in ICU4J
2016-01-15 01:10:49 +00:00
Ian Pedowitz
6477d4e0b6 Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev am: 33001945a8 am: 33b55366c5
am: 7191a77585  -s ours

* commit '7191a77585d04e5f8d472b37cc8b6f478eb708f5':
  DO NOT MERGE Fix for syncs being dropped when appIdle is on
2016-01-15 01:09:10 +00:00
Victor Chang
a6aee6bf73 Merge "Add Directory.ENTERPRISE_FILE_URI" 2016-01-15 00:45:47 +00:00
Andre Eisenbach
2787b33708 Fix OOB pairing related API build breakage
Change-Id: I813eaec0c5e97939998f4a1b26875af222ab4f89
2016-01-15 00:35:00 +00:00
John Reck
c816180962 Merge "Fix leak in unclipped save layer" 2016-01-15 00:30:08 +00:00
John Reck
8e068d5fd3 Fix leak in unclipped save layer
Change-Id: I31f146af2cb6f5cb8dd19bb0feff0ae35b864eba
2016-01-14 16:28:28 -08:00
Winson Chung
a6b591e053 Merge "Resetting the native shader instance when the shader changes." 2016-01-15 00:25:19 +00:00
Deepanshu Gupta
9757c933b0 LayoutLib: Fix device used comments in intensive tests am: 1665a621da
am: bbd0b324ba

* commit 'bbd0b324ba8e89bd51aad0a59b1a1c891383779f':
  LayoutLib: Fix device used comments in intensive tests
2016-01-15 00:23:33 +00:00
Alan Viverette
bc490ca283 Don\'t verify the scrollbar drawable am: a53c3b2197 am: ca6b87fea6
am: c8ef3f8730

* commit 'c8ef3f8730d20541e8f01f500c380fa09aa3853c':
  Don't verify the scrollbar drawable
2016-01-15 00:21:22 +00:00
Deepanshu Gupta
14df39f9e5 Merge "Fix custom font rendering" into mnc-ub-dev
am: f5984d5fce

* commit 'f5984d5fce511a669e8d4bb6eaeb9679ff2ba9f0':
  Fix custom font rendering
2016-01-15 00:19:08 +00:00
Deepanshu Gupta
bbd0b324ba LayoutLib: Fix device used comments in intensive tests
am: 1665a621da

* commit '1665a621da2d503d405fb784bd50b5a8596539a1':
  LayoutLib: Fix device used comments in intensive tests
2016-01-15 00:17:19 +00:00
Amit Mahajan
aa17797fda Merge "Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mm-wireless-dev
am: 49442a1dd7

* commit '49442a1dd7bbf15e6014e88d8143f198a43bad05':
  Adding new intent for EMERGENCY_CALL_STATE_CHANGE
2016-01-15 00:16:28 +00:00
Jakub Pawlowski
2fc6e6bfd2 Implementation of BluetoothDevice.createBondOutOfBand
This patch implements out of band pairing that uses optional data.
Currently, it works only for LE transport, using Temporary Key value.
In the future fields might be added to OOBData to support other options for
optional data.

Change-Id: I0811182efb72ac5f80521ed4876b32603cb628c1
2016-01-15 00:01:02 +00:00
Philip P. Moltmann
cdf2b40034 Enforce non-nullness in PrinterId and exploit it.
Change-Id: Ifdf3b2329548a665d609dd66b738baab5c765b54
2016-01-14 15:59:44 -08:00
Amit Mahajan
49442a1dd7 Merge "Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mm-wireless-dev 2016-01-14 23:54:14 +00:00
Deepanshu Gupta
4da12f19a6 Merge "Minor fix to wrong error message" 2016-01-14 23:54:14 +00:00
Tor Norbye
8b4a6981fd Minor fix to wrong error message
Change-Id: I3d34c90d37d35d0649a6ef8a73ca0d9320f975dd
2016-01-14 15:53:05 -08:00