Sudheer Shanka
569258689a
Made changes to fix some policy transparency options.
...
Add isInputMethodPermittedByAdmin and
isAccessibilityServicePermittedByAdmin APIs in DevicePolicyManager.
And update utility methods in RestrictedLockUtils to use the correct
userId when checking if disabled by admin.
Bug: 26897250
Bug: 26767564
Bug: 26966213
Change-Id: I0b74b3e57904a82f8ce72d856769d35b5e8403e5
2016-02-04 01:12:44 +00:00
Chulwoo Lee
4fb2d18c46
Merge "Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode""
2016-02-02 18:54:48 +00:00
Chulwoo Lee
072300558e
Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode"
...
This reverts commit a6130cee3ac9ed8648be005adcf217cf4426defc.
Change-Id: Id3d5ec0ca35bbd8e0b28b2b0dd936078b5da93d6
2016-02-02 18:34:58 +00:00
Zach Kuznia
7647b678c2
Merge "Make AccessibilityGestureDetector handle gesture detection start and end."
2016-02-02 18:31:35 +00:00
Geoff Mendal
31b48bee03
Import translations. DO NOT MERGE am: 34affa2303 -s ours am: 39c8547b5e -s ours
...
am: 556931fe58 -s ours
* commit '556931fe58b57895d351ddeea8355cfdbc1ae669':
Import translations. DO NOT MERGE
2016-02-02 18:25:49 +00:00
Geoff Mendal
556931fe58
Import translations. DO NOT MERGE am: 34affa2303 -s ours
...
am: 39c8547b5e -s ours
* commit '39c8547b5ebb9cfa7a05e788f43eaa77d9de1241':
Import translations. DO NOT MERGE
2016-02-02 18:19:18 +00:00
Abhijith Shastry
666d997cf0
Merge "Add API in TelecomService to manage blocked numbers."
2016-02-02 18:19:06 +00:00
Geoff Mendal
39c8547b5e
Import translations. DO NOT MERGE
...
am: 34affa2303 -s ours
* commit '34affa2303e959275eb66d91e2a416d7a69fc520':
Import translations. DO NOT MERGE
2016-02-02 18:16:26 +00:00
Chong Zhang
76e9d1d4be
Merge "Transfer focus from the current focused window for two-finger scroll"
2016-02-02 18:10:18 +00:00
Geoff Mendal
34affa2303
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 26887781
Change-Id: I2f77e533633815badf267419addb9d5f7686a200
2016-02-02 10:09:58 -08:00
Anna Galusza
aae7ad7496
Merge "Fix breakage due to incomplete name change."
2016-02-02 18:09:21 +00:00
Anna Galusza
fb695c633c
Fix breakage due to incomplete name change.
...
Change-Id: Ief02bd4a994a4ff3a571fedfead05c732043500d
2016-02-02 10:06:05 -08:00
Adam Powell
1a4cf4455b
Merge "Pinning components in ChooserActivity, take 2"
2016-02-02 18:02:17 +00:00
Tyler Gunn
5f651eef1e
Merge "Add new telephony disconnect cause for video calls when tty enabled." into mm-wireless-dev
...
am: 8562fb281c
* commit '8562fb281c37656d9198e6890f5c10e3541f6167':
Add new telephony disconnect cause for video calls when tty enabled.
2016-02-02 17:46:46 +00:00
Tyler Gunn
8562fb281c
Merge "Add new telephony disconnect cause for video calls when tty enabled." into mm-wireless-dev
2016-02-02 17:42:39 +00:00
Anna Galusza
427a182be4
Merge "Allow the drawer to not be shown."
2016-02-02 17:36:37 +00:00
Steve McKay
4ee5d5d5cf
Merge "Decouple SD card from ADVANCED storage toggle."
2016-02-02 17:29:04 +00:00
Steve McKay
efa1761776
Decouple SD card from ADVANCED storage toggle.
...
A variety of related fixes:
- don't force size enable when browsing from device mounted notifications.
- don't show settings menu item as action (put in overflow).
- add sd card icon (not quite yet used, need to suss that out).
Bug:26880985,26883578,26771127
Change-Id: I36f153c42217f8092f157ded2a756c02525593ab
2016-02-02 09:28:30 -08:00
Adam Powell
2388251fcd
Pinning components in ChooserActivity, take 2
...
Keep the ChooserActivity in the android:ui process/system.
Change-Id: Ia3ae29a8d629f41a53a066b9fc7ed0b28666b261
2016-02-02 09:26:30 -08:00
Philip P. Moltmann
56190d5e4b
Merge "Also search in description when filtering printers."
2016-02-02 16:36:36 +00:00
Philip P. Moltmann
e93cf151fb
Merge "Allow the PDF Printer to "print" non-locale-default paper sizes."
2016-02-02 16:34:48 +00:00
Geoff Mendal
6571322295
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ef9f2cbc84 -s ours am: 2335415569 -s ours
...
am: 1fa556d558 -s ours
* commit '1fa556d5581b9d2ce316099634dce272737602a9':
Import translations. DO NOT MERGE
2016-02-02 16:29:40 +00:00
Geoff Mendal
bb7dac1d69
Import translations. DO NOT MERGE am: 3dab749b31 -s ours am: 21890da2d8 -s ours
...
am: 3fc87906b7 -s ours
* commit '3fc87906b76c3aabe0e09f21db65d56ccb4f235a':
Import translations. DO NOT MERGE
2016-02-02 16:26:10 +00:00
Geoff Mendal
1fa556d558
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: ef9f2cbc84 -s ours
...
am: 2335415569 -s ours
* commit '23354155699fb1638ae1c4d5d8600200123d6dc5':
Import translations. DO NOT MERGE
2016-02-02 16:21:50 +00:00
Geoff Mendal
1d1db11704
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: a0cf483a13 -s ours
...
am: c7a9540eaa -s ours
* commit 'c7a9540eaa8e59ac98600c446278ed336285477a':
Import translations. DO NOT MERGE
2016-02-02 16:21:48 +00:00
Geoff Mendal
3fc87906b7
Import translations. DO NOT MERGE am: 3dab749b31 -s ours
...
am: 21890da2d8 -s ours
* commit '21890da2d808386ec7e8b322f8f033a0b63906d1':
Import translations. DO NOT MERGE
2016-02-02 16:20:17 +00:00
Geoff Mendal
7696d099f6
Import translations. DO NOT MERGE am: 1aa5b7517d -s ours
...
am: 2eefc8f648 -s ours
* commit '2eefc8f6485603a0329a09b02ee0783a361677e5':
Import translations. DO NOT MERGE
2016-02-02 16:19:45 +00:00
Geoff Mendal
c7a9540eaa
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
...
am: a0cf483a13 -s ours
* commit 'a0cf483a133ad4a0b8c680b1da196266be65150e':
Import translations. DO NOT MERGE
2016-02-02 16:16:48 +00:00
Geoff Mendal
2335415569
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
...
am: ef9f2cbc84 -s ours
* commit 'ef9f2cbc843c580f6de12aed0a94aeeeadb85ac7':
Import translations. DO NOT MERGE
2016-02-02 16:16:45 +00:00
Geoff Mendal
2eefc8f648
Import translations. DO NOT MERGE
...
am: 1aa5b7517d -s ours
* commit '1aa5b7517d55d1c9d43ad5474da238aa3c14a885':
Import translations. DO NOT MERGE
2016-02-02 16:14:23 +00:00
Geoff Mendal
21890da2d8
Import translations. DO NOT MERGE
...
am: 3dab749b31 -s ours
* commit '3dab749b317485bbee345e08cebf91e9ac80b59d':
Import translations. DO NOT MERGE
2016-02-02 16:12:16 +00:00
Geoff Mendal
ef9f2cbc84
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
2016-02-02 16:09:01 +00:00
Geoff Mendal
a0cf483a13
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
2016-02-02 16:04:49 +00:00
Geoff Mendal
e8342eefbb
Import translations. DO NOT MERGE
...
Change-Id: I125fdf9cff416791a54d42450e6ef63ffec48a6f
Auto-generated-cl: translation import
2016-02-02 08:03:45 -08:00
Andreas Gampe
fe54b11803
Merge "Frameworks/base: Add A/B OTA preopting"
2016-02-02 16:01:11 +00:00
Geoff Mendal
d4f95c1d87
Import translations. DO NOT MERGE
...
Change-Id: If53700bcc5370eda1b87001b00f039a4d5fa016a
Auto-generated-cl: translation import
2016-02-02 17:00:13 +01:00
Geoff Mendal
3dab749b31
Import translations. DO NOT MERGE
...
Change-Id: I491375fe7c3f4bafb6a310830c12cd1459072670
Auto-generated-cl: translation import
2016-02-02 07:57:06 -08:00
Geoff Mendal
1aa5b7517d
Import translations. DO NOT MERGE
...
Change-Id: If918aa7c054de6b991dbce81ec459d7ca88dc71b
Auto-generated-cl: translation import
2016-02-02 16:54:58 +01:00
Ritesh Reddy
76fb3ee78f
Merge "Constrained allowable backup versions"
2016-02-02 14:18:23 +00:00
Narayan Kamath
dd1f99dad1
Merge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f." am: 60cbd0b02b
...
am: 9572aae96e
* commit '9572aae96ed644c18a9f456856ad34714ee31aeb':
Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.
2016-02-02 12:08:20 +00:00
Narayan Kamath
9572aae96e
Merge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f."
...
am: 60cbd0b02b
* commit '60cbd0b02beb94b175e55d61bd64036a99029850':
Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.
2016-02-02 12:03:53 +00:00
Narayan Kamath
60cbd0b02b
Merge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f."
2016-02-02 11:55:59 +00:00
Narayan Kamath
907ada822f
Merge "Track libcore change f35c08530f77a744646e6e988d330a68f3af6940."
2016-02-02 11:55:34 +00:00
Narayan Kamath
c449386ea0
Track libcore change f35c08530f77a744646e6e988d330a68f3af6940.
...
Change-Id: I53bb912e7b7d6510952da8b121402628fa3f922d
2016-02-02 11:54:01 +00:00
Ritesh Reddy
2400d27a65
Constrained allowable backup versions
...
Constrained the version on an incoming backup set
to the highest version that the SettingsBackupAgent
can handle. This is to deal with either corrupted backup
sets or newer backup sets (when modifiying/downgrading the
SettingsBackupAgent).
Change-Id: I4d666e8d4541c0b86e656a73744837d03318c4ae
2016-02-02 11:42:26 +00:00
Narayan Kamath
edf2d224a2
Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.
...
Change-Id: Ib0e5efc903fe522fb2bc314b9000a26e90a4ea57
2016-02-02 11:40:12 +00:00
Victor Chang
fe13c5fbe1
Merge "Fix that can't launch managed QuickContact in ContactSearch"
2016-02-02 11:02:07 +00:00
Daichi Hirono
10c3d3f666
Merge "Mount appfuse in process namespace."
2016-02-02 10:14:27 +00:00
Narayan Kamath
2a27769654
Merge "Alarm: add missing closedir after opendir when searching for RTC" am: 21b2b7306e
...
am: 7b33488e12
* commit '7b33488e124bbe2a9fcfa6cd7a78726bc932ac8b':
Alarm: add missing closedir after opendir when searching for RTC
2016-02-02 09:41:12 +00:00
Narayan Kamath
7b33488e12
Merge "Alarm: add missing closedir after opendir when searching for RTC"
...
am: 21b2b7306e
* commit '21b2b7306e7d0612cdcb90eaa8102b6a7fa3f130':
Alarm: add missing closedir after opendir when searching for RTC
2016-02-02 09:36:55 +00:00