Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,840 Commits 3 Branches 0 Tags
f2aec548c325e52cd1126f059fa0ea2e1952ed2c
Commit Graph

7842 Commits

Author SHA1 Message Date
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
Sudheer Shanka
09243d0451 Merge "Flush package restriction changes for a user." into nyc-dev am: f9124ec 
am: 3430c45

* commit '3430c45bcb10ca6ba4c67b2f5e273e3be08b087b':
  Flush package restriction changes for a user.
 2016-03-17 18:55:04 +00:00
Jeff Sharkey
7029a23b38 Merge "Defuse Bundles parsed by the system process." into nyc-dev am: c4b0ade 
am: a0f6318

* commit 'a0f6318f44244ec4e916d3abecf157beb4fefc8c':
  Defuse Bundles parsed by the system process.
 2016-03-17 18:54:28 +00:00
Selim Cinek
8031be0346 Merge "Decorated custom views now behave better if no custom view is set" into nyc-dev 
am: 62dfd5f

* commit '62dfd5fe7832d266b72d3ab86eeafec7e7eeba94':
  Decorated custom views now behave better if no custom view is set
 2016-03-17 18:02:13 +00:00
Christopher Tate
022c4aa9e2 Merge "Lower the minimum period for periodic jobs to 15 minutes" into nyc-dev 
am: 943c68a

* commit '943c68ae0683c602ef704aa0c0270b93ec8b4154':
  Lower the minimum period for periodic jobs to 15 minutes
 2016-03-17 18:02:08 +00:00
Michal Karpinski
e165d40d2d Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev 
am: c7605b83

* commit 'c7605b838bda61593e503924c6c86e3a33a6d64b':
  Unifying method names and comments to security logging, not device logging
 2016-03-17 18:01:45 +00:00
Selim Cinek
62dfd5fe78 Merge "Decorated custom views now behave better if no custom view is set" into nyc-dev 2016-03-17 17:35:48 +00:00
Sudheer Shanka
3430c45bcb Merge "Flush package restriction changes for a user." into nyc-dev 
am: f9124ec

* commit 'f9124ecad9ec20f572df8cdca6f985ef3f97210d':
  Flush package restriction changes for a user.
 2016-03-17 17:35:25 +00:00
Jeff Sharkey
a0f6318f44 Merge "Defuse Bundles parsed by the system process." into nyc-dev 
am: c4b0ade

* commit 'c4b0ade245fcf6546ac722ac9ce6ddd30b473e68':
  Defuse Bundles parsed by the system process.
 2016-03-17 17:35:04 +00:00
Chris Tate
943c68ae06 Merge "Lower the minimum period for periodic jobs to 15 minutes" into nyc-dev 2016-03-17 17:13:12 +00:00
Rubin Xu
c7605b838b Merge "Unifying method names and comments to security logging, not device logging" into nyc-dev 2016-03-17 11:23:55 +00:00
Andrii Kulian
58178f2fe4 Add additional logging for incorrect activity stop 
Print ActivityClientRecord state when ActivityThread#performStopActivityInner
is called for already stopped activity.

Bug: 25267624
Change-Id: I2b044e42d0188ef9eaf15422b6a05617ade802e2
 2016-03-16 23:24:27 -07:00
Benjamin Franz
f9124ecad9 Merge "Flush package restriction changes for a user." into nyc-dev 2016-03-16 23:51:44 +00:00
Jeff Sharkey
d136e51a99 Defuse Bundles parsed by the system process. 
It's easy for apps to throw custom Parcelables into Bundles, but
if the system tries peeking inside one of these Bundles, it triggers
a BadParcelableException.  If that Bundle was passed away from the
Binder thread that delivered it into the system, we end up with a
nasty runtime restart.

This change mitigates this trouble by "defusing" any Bundles parsed by
the system server.  That is, if it encounters BadParcelableException
while unpacking a Bundle, it logs and delivers an empty Bundle as
the result.

Simultaneously, to help catch the system process sticking its
fingers into Bundles that are destined for other processes, a Bundle
now tracks if it's "defusable."  For example, any Intents delivered
through ActivityThread are marked as being defusable, since they've
arrived at their final destination.  Any other Bundles are considered
to be "in transit" and we log if the system tries unparceling them.

Merges several Parcel boolean fields into a flags int.  Add better
docs to several classes.

Bug: 27581063
Change-Id: I28cf3e7439503b5dc9a429bafae5eb48f21f0d93
 2016-03-16 14:45:26 -06:00
Peng Xu
9f09d21b00 Merge "Exposing Context Hub service." into nyc-dev am: ac329d3 
am: f3882c8

* commit 'f3882c8633edafbc072713033627582934491b32':
  Exposing Context Hub service.
 2016-03-16 17:30:38 +00:00
Peng Xu
f3882c8633 Merge "Exposing Context Hub service." into nyc-dev 
am: ac329d3

* commit 'ac329d3e34e99e10243906d32cc4e36c626ac8ee':
  Exposing Context Hub service.
 2016-03-16 17:28:16 +00:00