Dianne Hackborn
2d9b2b98ef
Merge "Fix issue #27653326 : Sync doesn\'t work in doze maintenance" into nyc-dev am: bf949ce
...
am: 23430bf#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#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
2016-03-18 22:20:29 +00:00
George Mount
4261a095ad
Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev
...
am: 7f1bdd9
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
2016-03-18 20:09:53 +00:00
Jeff Sharkey
c012cf2686
Merge "Mark more Bundles as being defusable." into nyc-dev
...
am: 620a28b
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
Phil Weaver
eb3ce37ba4
Merge "Add intdef for UiAutomation flags." into nyc-dev am: 3b2e22a
...
am: 3aeb4c4
2016-03-18 15:17:17 +00:00
Phil Weaver
3aeb4c4616
Merge "Add intdef for UiAutomation flags." into nyc-dev
...
am: 3b2e22a
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
2016-03-17 22:09:46 +00:00
Jeff Sharkey
5a128c4f33
Merge "Refactoring FBE APIs based on council feedback." into nyc-dev
...
am: a0a58a2
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
2016-03-17 19:43:05 +00:00
Adrian Roos
eca42af23b
Merge "Fix action container visibility" into nyc-dev am: c2b2104
...
am: 572feb5
2016-03-17 19:43:02 +00:00
Andrii Kulian
f01558e492
Merge "Add additional logging for incorrect activity stop" into nyc-dev
...
am: 30b93a6
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
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
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
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
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
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
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
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
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
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
2016-03-17 17:35:25 +00:00
Jeff Sharkey
a0f6318f44
Merge "Defuse Bundles parsed by the system process." into nyc-dev
...
am: c4b0ade
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
2016-03-16 17:30:38 +00:00
Peng Xu
f3882c8633
Merge "Exposing Context Hub service." into nyc-dev
...
am: ac329d3
2016-03-16 17:28:16 +00:00
Ashutosh Joshi
ac329d3e34
Merge "Exposing Context Hub service." into nyc-dev
2016-03-16 17:21:33 +00:00
Julia Reynolds
2de0733190
Merge "Prevent apps without DND access from toggling DND via AudioService." into nyc-dev am: af56824
...
am: 0fb0f9a
2016-03-16 16:55:12 +00:00
Julia Reynolds
0fb0f9a7a6
Merge "Prevent apps without DND access from toggling DND via AudioService." into nyc-dev
...
am: af56824
2016-03-16 16:53:02 +00:00
Julia Reynolds
af56824e35
Merge "Prevent apps without DND access from toggling DND via AudioService." into nyc-dev
2016-03-16 16:48:33 +00:00
Michal Karpinski
6235a94ffa
Unifying method names and comments to security logging, not device logging
...
Also move SecurityLog to android.app.admin package.
Bug: 27531824
Bug: 27532560
Bug: 27532564
Bug: 27532425
Change-Id: I2677afdb5685bc5d21e52c41b381b57a41e364b6
2016-03-16 14:32:09 +00:00
Esteban Talavera
4a23dd030a
Merge "Clarified documentation as requested by API review" into nyc-dev am: 5fbfa1b
...
am: b9a69c6
2016-03-16 14:30:09 +00:00
Esteban Talavera
b9a69c622b
Merge "Clarified documentation as requested by API review" into nyc-dev
...
am: 5fbfa1b
2016-03-16 14:27:50 +00:00
Esteban Talavera
5fbfa1b0d2
Merge "Clarified documentation as requested by API review" into nyc-dev
2016-03-16 14:24:40 +00:00
