Vadim Tryshev
aa0dfc8c41
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev am: 4eeb7e2cae
...
am: ed633e97e3
2016-03-09 23:52:35 +00:00
Vadim Tryshev
ed633e97e3
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev
...
am: 4eeb7e2cae
2016-03-09 23:50:35 +00:00
Vadim Tryshev
4eeb7e2cae
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev
2016-03-09 23:44:23 +00:00
Jeff Sharkey
5b416edcff
Merge "Log when pre-N apps send too much to DropBox." into nyc-dev am: 93720d5729
...
am: 7051cad205
2016-03-09 23:39:22 +00:00
Jeff Sharkey
7051cad205
Merge "Log when pre-N apps send too much to DropBox." into nyc-dev
...
am: 93720d5729
2016-03-09 23:37:21 +00:00
Jeff Sharkey
93720d5729
Merge "Log when pre-N apps send too much to DropBox." into nyc-dev
2016-03-09 23:31:01 +00:00
Jeff Sharkey
b8e8a91f54
Log when pre-N apps send too much to DropBox.
...
Once they target N, they'll start getting exceptions, which is
intended to make sure they pay attention to data that would have
otherwise been dropped on the floor.
Bug: 27571535
Change-Id: I49163679c629cd0788327d2c3a654e757ecdcb99
2016-03-09 16:27:42 -07:00
Makoto Onuki
108853ba12
Merge "ShortcutManager: add remaining APIs." into nyc-dev am: 4a07c34ca8
...
am: 027fd0ae95
2016-03-09 22:35:38 +00:00
Makoto Onuki
027fd0ae95
Merge "ShortcutManager: add remaining APIs." into nyc-dev
...
am: 4a07c34ca8
2016-03-09 22:33:35 +00:00
Makoto Onuki
4a07c34ca8
Merge "ShortcutManager: add remaining APIs." into nyc-dev
2016-03-09 22:28:45 +00:00
Suprabh Shukla
6a643dbee7
Merge "Calling method in DPMS after resolving userId" into nyc-dev am: d7924b6063
...
am: 06a3c6d32c
2016-03-09 22:02:22 +00:00
Suprabh Shukla
06a3c6d32c
Merge "Calling method in DPMS after resolving userId" into nyc-dev
...
am: d7924b6063
2016-03-09 21:58:10 +00:00
Suprabh Shukla
d7924b6063
Merge "Calling method in DPMS after resolving userId" into nyc-dev
2016-03-09 21:50:44 +00:00
Suprabh Shukla
8bea73e5c1
Calling method in DPMS after resolving userId
...
ActivityManagerService was calling
hasDeviceOwnerOrProfileOwner in DevicePolicyManagerService.LocalService
before resolving negative userIds to a real user. Moved the call to a point
when userId is already resolved.
bug: b/27538249
Change-Id: I760412978b3260523e9abcfe59d8e100ec4af12f
2016-03-09 13:38:15 -08:00
Vadim Tryshev
93a914a77f
Fixing bugs with peeking a wallpaper.
...
1. Cached wallpaper from one user could be retrieved
for another user. Fixed with adding a mCachedWallpaperUserId
member.
2. mDefault wallpaper was returned too early. Moved down
so that default wallpaper could be returned only after
making sure that system wallpaper is unspecified.
Bug: 25185253
Change-Id: Ie620621e5c4039d5d680211150aa5327f321f11a
2016-03-09 20:36:01 +00:00
Chris Wren
52165a7ab0
Merge "add a ranking service to the rocket" into nyc-dev am: a82662e3f5
...
am: 2be6b136a8
2016-03-09 16:52:05 +00:00
Chris Wren
2be6b136a8
Merge "add a ranking service to the rocket" into nyc-dev
...
am: a82662e3f5
2016-03-09 16:47:46 +00:00
Alan Viverette
c6dfb332ba
Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev am: 2c18cd0823
...
am: 669b25d58e
2016-03-09 16:31:06 +00:00
Robin Lee
4a23e41cb4
Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev am: 9acee934de
...
am: c3152fe087
2016-03-09 16:31:05 +00:00
Alan Viverette
669b25d58e
Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev
...
am: 2c18cd0823
2016-03-09 16:28:52 +00:00
Robin Lee
c3152fe087
Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev
...
am: 9acee934de
2016-03-09 16:28:51 +00:00
Chris Wren
a82662e3f5
Merge "add a ranking service to the rocket" into nyc-dev
2016-03-09 16:26:56 +00:00
Alan Viverette
2c18cd0823
Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev
2016-03-09 15:52:35 +00:00
Robin Lee
9acee934de
Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev
2016-03-09 15:48:25 +00:00
Robin Lee
a1b290e11a
Corrections to javadoc for install & removeKeyPair
...
Making these more consistent - refer to 'certificate and private key
pair' in titles instead of 'credentials'. It is still used in one place
where 'credentials' makes sense.
Bug: 27533004
Change-Id: Ied80017c6f391646b10921b011be35eea113373f
2016-03-09 14:38:36 +00:00
Makoto Onuki
5504622fb0
ShortcutManager: add remaining APIs.
...
- Icons are now persisted. (under /data/system_ce, as PNGs)
- the "load icon" APIs in LauncherApps are supported.
- Implement updateShortcuts()
- Addressed all the comments on the previous CL
- @hide the newly added constructor for PersistableBundle
- Enhance incoming shortcut validation
- A lot of internal clean-up.
Bug 27548047
Change-Id: I8e3c1ccd3e0a997a6d271c84d81170f0c022b60e
2016-03-08 18:37:32 -08:00
Sudheer Shanka
80e6e6332b
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev am: 97e89c624e
...
am: 6f0d578ea9
2016-03-08 23:49:35 +00:00
Alan Viverette
4d1ad994d3
Set DatePickerListener last during DatePickerDialog construction
...
Prevents us from calling the listener before we're fully set up.
Bug: 27475444
Change-Id: I0def384b60c09c44d36e60503ddb8434055dfb6f
2016-03-08 18:48:47 -05:00
Sudheer Shanka
6f0d578ea9
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev
...
am: 97e89c624e
2016-03-08 23:09:23 +00:00
Sudheer Shanka
97e89c624e
Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev
2016-03-08 22:52:11 +00:00
Selim Cinek
5473760ae0
Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev am: c5ce69f555
...
am: 47bc04b0b0
2016-03-08 22:47:06 +00:00
Selim Cinek
47bc04b0b0
Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev
...
am: c5ce69f555
2016-03-08 22:27:42 +00:00
Chris Wren
0efdb88ccc
add a ranking service to the rocket
...
Bug: 22960980
Change-Id: Ic0e911a2f048a4b47171b338c3de13125852be43
2016-03-08 17:23:33 -05:00
Selim Cinek
c5ce69f555
Merge "Fixed a bug where the font sizes where not enforced correctly" into nyc-dev
2016-03-08 22:16:44 +00:00
Adrian Roos
6f86c33ee2
Merge "Fix and optimize stripForDelivery" into nyc-dev am: 37b3a4a544
...
am: 336256e1f6
2016-03-08 22:05:27 +00:00
Adrian Roos
336256e1f6
Merge "Fix and optimize stripForDelivery" into nyc-dev
...
am: 37b3a4a544
2016-03-08 21:50:32 +00:00
Adrian Roos
37b3a4a544
Merge "Fix and optimize stripForDelivery" into nyc-dev
2016-03-08 21:47:03 +00:00
Makoto Onuki
af00108ca4
resolve merge conflicts of 1ca3800c44 to master
...
Change-Id: I4657cdf99900cd555c3109605e8cbdbb0fed79e6
2016-03-08 10:39:25 -08:00
Makoto Onuki
1ca3800c44
Merge "Introducing ShortcutManager" into nyc-dev
...
am: ed58f5f0aa
2016-03-08 18:05:33 +00:00
Makoto Onuki
ed58f5f0aa
Merge "Introducing ShortcutManager" into nyc-dev
2016-03-08 18:01:05 +00:00
Julia Reynolds
9a49d6c8ac
Merge "Condition cleanup." into nyc-dev am: 4ed0e8cf8f
...
am: ad23e7bf78
2016-03-08 17:47:00 +00:00
Julia Reynolds
ad23e7bf78
Merge "Condition cleanup." into nyc-dev
...
am: 4ed0e8cf8f
2016-03-08 17:43:21 +00:00
Julia Reynolds
4ed0e8cf8f
Merge "Condition cleanup." into nyc-dev
2016-03-08 17:39:01 +00:00
Julia Reynolds
1d6d16d699
Condition cleanup.
...
Change-Id: If978bebac52c0b1438e86339669f409b4b17c6fc
2016-03-08 10:41:31 -05:00
Jorim Jaggi
80a192059f
Merge "Don\'t dock tasks that are non-dockable" into nyc-dev am: f2d7b28115
...
am: d31546c9e8
2016-03-08 15:36:30 +00:00
Jorim Jaggi
d31546c9e8
Merge "Don\'t dock tasks that are non-dockable" into nyc-dev
...
am: f2d7b28115
2016-03-08 15:34:30 +00:00
Jorim Jaggi
f2d7b28115
Merge "Don't dock tasks that are non-dockable" into nyc-dev
2016-03-08 15:27:56 +00:00
Jorim Jaggi
aa6c574411
Don't dock tasks that are non-dockable
...
Bug: 27200491
Change-Id: I4578441b37734b85ea03b3bb67e57abed8b21182
2016-03-08 16:20:54 +01:00
Chris Wren
a06ef18843
Merge "rename the asisstant service for the ranker" into nyc-dev am: be3696d425
...
am: 4c2e7ad458
2016-03-08 15:05:26 +00:00
Chris Wren
4c2e7ad458
Merge "rename the asisstant service for the ranker" into nyc-dev
...
am: be3696d425
2016-03-08 15:01:20 +00:00
