Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,050 Commits 3 Branches 0 Tags
fe5cd89cb9a34520fbf04b4e9efc455c5ca5c00f
Commit Graph

7857 Commits

Author SHA1 Message Date
Tony Mak
fe5cd89cb9 Revert getUserInfo change and add isManagedPorfile(int userId) am: 8673b28 
am: 438b3f2

* commit '438b3f218dbf3e0fe33676afe5e1e4fcfd4f2dcc':
  Revert getUserInfo change and add isManagedPorfile(int userId)
 2016-03-22 15:32:58 +00:00
Tony Mak
438b3f218d Revert getUserInfo change and add isManagedPorfile(int userId) 
am: 8673b28

* commit '8673b2899e775014336efff44ea88dcac2b25bdd':
  Revert getUserInfo change and add isManagedPorfile(int userId)
 2016-03-22 15:30:21 +00:00
Tony Mak
8673b2899e Revert getUserInfo change and add isManagedPorfile(int userId) 
Bug: 26469166
Change-Id: I60b70170ddc80432fc8f638b1f63c4e9f5212785
 2016-03-22 15:26:05 +00:00
Benjamin Franz
f6aeab55c4 Merge "Clean up some javadoc issues" into nyc-dev am: 517a958 
am: 37c5dff

* commit '37c5dff49de952fbbc7f8ee00d9d0d0399e60fc1':
  Clean up some javadoc issues
 2016-03-22 11:40:06 +00:00
Benjamin Franz
37c5dff49d Merge "Clean up some javadoc issues" into nyc-dev 
am: 517a958

* commit '517a9583a869ed1913efeb003592db184d1a09e0':
  Clean up some javadoc issues
 2016-03-22 11:37:26 +00:00
Benjamin Franz
517a9583a8 Merge "Clean up some javadoc issues" into nyc-dev 2016-03-22 11:30:47 +00:00
Benjamin Franz
ea95624290 Clean up some javadoc issues 
Bug: 27672974
Bug: 25881314
Change-Id: Ida53e3bf23b2492c26f4a82878fa192110a8794f
 2016-03-22 11:26:48 +00:00
Christopher Tate
f8d09be47e Merge "Add API to read the current wallpaper\'s ID" into nyc-dev am: c823df1 
am: 924f6d8

* commit '924f6d87da6ebb75d03760becc99306a1daf5533':
  Add API to read the current wallpaper's ID
 2016-03-22 00:10:02 +00:00
Christopher Tate
924f6d87da Merge "Add API to read the current wallpaper\'s ID" into nyc-dev 
am: c823df1

* commit 'c823df1435b6e660a2ed2f345a28b1f391378f0f':
  Add API to read the current wallpaper's ID
 2016-03-22 00:07:23 +00:00
Chris Tate
c823df1435 Merge "Add API to read the current wallpaper's ID" into nyc-dev 2016-03-22 00:03:14 +00:00
Christopher Tate
e409f0e462 Add API to read the current wallpaper's ID 
Also regularize cross-user call handling throughout.

Bug 27743435

Change-Id: Ibc530d0576d657723a613888357a6ea71b482763
 2016-03-21 15:32:57 -07:00
Wale Ogunwale
9484c75638 Merge "Added support to specify animation duration when resizing stack" into nyc-dev am: 85941cf 
am: 99ef1db

* commit '99ef1dbbe9d703ab1f485a759ad1c918293a00c8':
  Added support to specify animation duration when resizing stack
 2016-03-21 20:13:47 +00:00
Wale Ogunwale
99ef1dbbe9 Merge "Added support to specify animation duration when resizing stack" into nyc-dev 
am: 85941cf

* commit '85941cff0c65bc023e4ca29c0eac8548c8f61be6':
  Added support to specify animation duration when resizing stack
 2016-03-21 20:11:03 +00:00
Wale Ogunwale
85941cff0c Merge "Added support to specify animation duration when resizing stack" into nyc-dev 2016-03-21 20:04:20 +00:00
Wale Ogunwale
e75a9adfbd Added support to specify animation duration when resizing stack 
Needed for sys-ui to control the duration of various Pip transitions.

Bug: 27674339
Change-Id: I7bad27aaa19755a73c594e88b88b56db033e1a45
 2016-03-21 11:17:19 -07:00
Tony Mak
7ccbbc7940 Merge "Show launcher when profile is locked immediately" into nyc-dev am: 03bdd9f 
am: 9e634ad

* commit '9e634ad25d09b44eda8651272b54c68480bec6e8':
  Show launcher when profile is locked immediately
 2016-03-21 14:27:15 +00:00
Tony Mak
9e634ad25d Merge "Show launcher when profile is locked immediately" into nyc-dev 
am: 03bdd9f

* commit '03bdd9fa0e79aa7d4da5bc3704c74f575ab1bfa6':
  Show launcher when profile is locked immediately
 2016-03-21 14:24:50 +00:00
Tony Mak
03bdd9fa0e Merge "Show launcher when profile is locked immediately" into nyc-dev 2016-03-21 14:20:45 +00:00
Tony Mak
9c6e8ced9b Show launcher when profile is locked immediately 
Previously, we show launcher when keyguard is dismissed.
It introduces these issues:
1. There can be no device lock
2. user could take a quick peek of the work app

Current behavior:
1. We now show launcher once the work profile is locked.
2. Lock profile immediately if there is no device lock
3. Add cancel "lockProfileLater" logic

Bug: 27241680
Bug: 27673460
Change-Id: I765aa22d4c8ae5017c1611f5a340a4b33d463b1e
 2016-03-21 13:54:32 +00:00
Victor Chang
40240b17c9 Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev am: d3c0cf5 
am: 6918dbc

* commit '6918dbc87144d273fae62dae7c524993f0cbba7b':
  Api change of DPM.setApplicationRestrictionsManagingPackage()
 2016-03-21 13:15:12 +00:00
Victor Chang
6918dbc871 Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev 
am: d3c0cf5

* commit 'd3c0cf50b6c8e71c0c409abcd3b8c32f98f7cb71':
  Api change of DPM.setApplicationRestrictionsManagingPackage()
 2016-03-21 13:12:47 +00:00
Victor Chang
d3c0cf50b6 Merge "Api change of DPM.setApplicationRestrictionsManagingPackage()" into nyc-dev 2016-03-21 13:08:14 +00:00
Dianne Hackborn
2d9b2b98ef Merge "Fix issue #27653326: Sync doesn\'t work in doze maintenance" into nyc-dev am: bf949ce 
am: 23430bf

* commit '23430bf34ce51fd60ba9738913cf2a600384786a':
  Fix issue #27653326: Sync doesn't work in doze maintenance
 2016-03-19 01:00:06 +00:00
Dianne Hackborn
23430bf34c Merge "Fix issue #27653326: Sync doesn\'t work in doze maintenance" into nyc-dev 
am: bf949ce

* commit 'bf949ce8a0f8d0a39bdc069c4bedddc4edef26e2':
  Fix issue #27653326: Sync doesn't work in doze maintenance
 2016-03-19 00:57:50 +00:00
Dianne Hackborn
2fefbcf0d1 Fix issue #27653326: Sync doesn't work in doze maintenance 
Add a (configurable) delay between when we start a maintenance
window until the minimum time we will end it.

Also switch to using the alarm manager callback API.  (Yay!)

Also fix a little printing problem in the alarm manager dump
so we put the package name and not some class hash in the
summary string of an alarm entry.

Change-Id: I4281e5c80bc8b26ebc1fb6f603ec33ec0e379daa
 2016-03-18 16:52:30 -07:00
George Mount
3fbaafa4e1 Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev am: 7f1bdd9 
am: 4261a09

* commit '4261a095ad5efce7690d4d1836448d7efc0e6557':
  Add @SafeVarargs for methods using typevar varargs.
 2016-03-18 22:20:29 +00:00
George Mount
4261a095ad Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev 
am: 7f1bdd9

* commit '7f1bdd9f9180574c8b6b98cefe3c542b92477295':
  Add @SafeVarargs for methods using typevar varargs.
 2016-03-18 22:17:38 +00:00
George Mount
7f1bdd9f91 Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev 2016-03-18 22:11:39 +00:00
Jeff Sharkey
4621029922 Merge "Mark more Bundles as being defusable." into nyc-dev am: 620a28b 
am: c012cf2

* commit 'c012cf26869e432adf8461e7134f117d95f239e2':
  Mark more Bundles as being defusable.
 2016-03-18 20:09:53 +00:00
Jeff Sharkey
c012cf2686 Merge "Mark more Bundles as being defusable." into nyc-dev 
am: 620a28b

* commit '620a28bad2b1ddabddf2d78b5a20a762ebc29205':
  Mark more Bundles as being defusable.
 2016-03-18 20:06:07 +00:00
Jeff Sharkey
620a28bad2 Merge "Mark more Bundles as being defusable." into nyc-dev 2016-03-18 19:54:52 +00:00
Jeff Sharkey
a04c7a7c64 Mark more Bundles as being defusable. 
They're destined for the system, so they're okay to look inside.

Bug: 27726127
Change-Id: Ic85c308a8efe6f9b8652952717c72b3c663d328a
 2016-03-18 12:20:39 -06:00
Victor Chang
cd14c0a9da Api change of DPM.setApplicationRestrictionsManagingPackage() 
Throws NameNotFoundException instead of IllegalArgumentException

Can't throw NameNotFoundException directly from DPMS as
aidl doesn't support checked exception

Bug: 27532565
Change-Id: I202721f41057f92ad2dd851d4769ba4502a8f9b3
 2016-03-18 16:44:21 +00:00
Phil Weaver
eb3ce37ba4 Merge "Add intdef for UiAutomation flags." into nyc-dev am: 3b2e22a 
am: 3aeb4c4

* commit '3aeb4c461635e3c6c4187c2e77e7ae4e060c70b6':
  Add intdef for UiAutomation flags.
 2016-03-18 15:17:17 +00:00
Phil Weaver
3aeb4c4616 Merge "Add intdef for UiAutomation flags." into nyc-dev 
am: 3b2e22a

* commit '3b2e22a004f659c2e18faa7f2a6e0aa73ce695f2':
  Add intdef for UiAutomation flags.
 2016-03-18 15:15:02 +00:00
Phil Weaver
3b2e22a004 Merge "Add intdef for UiAutomation flags." into nyc-dev 2016-03-18 15:08:45 +00:00
Jeff Sharkey
78bcc89df4 Merge "Refactoring FBE APIs based on council feedback." into nyc-dev am: a0a58a2 
am: 5a128c4

* commit '5a128c4f33aa38d3a35b5884519f6bd3a355512d':
  Refactoring FBE APIs based on council feedback.
 2016-03-17 22:09:46 +00:00
Jeff Sharkey
5a128c4f33 Merge "Refactoring FBE APIs based on council feedback." into nyc-dev 
am: a0a58a2

* commit 'a0a58a2fd5cbc1bb8056227bb04f276b364c6e96':
  Refactoring FBE APIs based on council feedback.
 2016-03-17 22:07:23 +00:00
Jeff Sharkey
a0a58a2fd5 Merge "Refactoring FBE APIs based on council feedback." into nyc-dev 2016-03-17 22:00:26 +00:00
Jeff Sharkey
8a372a0a28 Refactoring FBE APIs based on council feedback. 
Mostly consists of removing the word "encryption" from most APIs,
since we can't actually make promises about the data being encrypted.

Bug: 27531029
Change-Id: Iace9d7c4e64716abf86ed11847c40f3947e1d625
 2016-03-17 14:49:08 -06:00
Andrii Kulian
103b77fb4c Merge "Add additional logging for incorrect activity stop" into nyc-dev am: 30b93a6 
am: f01558e

* commit 'f01558e492f6be57d1cf2e7469decc2b595a1b9c':
  Add additional logging for incorrect activity stop
 2016-03-17 19:43:05 +00:00
Adrian Roos
eca42af23b Merge "Fix action container visibility" into nyc-dev am: c2b2104 
am: 572feb5

* commit '572feb5545529c4c747de3e100985a46ef13ad0e':
  Fix action container visibility
 2016-03-17 19:43:02 +00:00
Andrii Kulian
f01558e492 Merge "Add additional logging for incorrect activity stop" into nyc-dev 
am: 30b93a6

* commit '30b93a6d9d6a2cc865b0db0c29c53fa13b29be63':
  Add additional logging for incorrect activity stop
 2016-03-17 19:23:56 +00:00
Andrii Kulian
30b93a6d9d Merge "Add additional logging for incorrect activity stop" into nyc-dev 2016-03-17 19:19:20 +00:00
Adrian Roos
572feb5545 Merge "Fix action container visibility" into nyc-dev 
am: c2b2104

* commit 'c2b21046193f84c5e3c1955e1f8c5986b4fdb487':
  Fix action container visibility
 2016-03-17 19:12:22 +00:00
Selim Cinek
4c4ecb26a3 Merge "Decorated custom views now behave better if no custom view is set" into nyc-dev am: 62dfd5f 
am: 8031be0

* commit '8031be0346e2964b1be7ea8ca6b446a0c00864da':
  Decorated custom views now behave better if no custom view is set
 2016-03-17 19:09:41 +00:00
Christopher Tate
e2a498a97e Merge "Lower the minimum period for periodic jobs to 15 minutes" into nyc-dev am: 943c68a 
am: 022c4aa

* commit '022c4aa9e270dd0fe0b35cb02e66c6b49db78220':
  Lower the minimum period for periodic jobs to 15 minutes
 2016-03-17 19:09:35 +00:00
Michal Karpinski
8f8e9e3d99 Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev am: c7605b83 
am: e165d40

* commit 'e165d40d2d03cde6f8ed8da523b65553de800906':
  Unifying method names and comments to security logging, not device logging
 2016-03-17 19:09:08 +00:00
Adrian Roos
c2b2104619 Merge "Fix action container visibility" into nyc-dev 2016-03-17 19:07:01 +00:00
Adrian Roos
7052de55ed Fix action container visibility 
Bug: 27720398
Fixes: 27720398
Change-Id: I8ca4430c182ffdef81f5752d5d1bea0a4975e63f
 2016-03-17 19:06:18 +00:00