Commit Graph

7819 Commits

Author SHA1 Message Date
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
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

* commit '0fb0f9a7a6f0b051b976c01c3dcf21b92bacd059':
  Prevent apps without DND access from toggling DND via AudioService.
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

* commit 'af56824e35341f46418c39e47b6855223a446c63':
  Prevent apps without DND access from toggling DND via AudioService.
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

* commit 'b9a69c622b727e662d419815c2e091a7a47d2c0d':
  Clarified documentation as requested by API review
2016-03-16 14:30:09 +00:00
Esteban Talavera
b9a69c622b Merge "Clarified documentation as requested by API review" into nyc-dev
am: 5fbfa1b

* commit '5fbfa1b0d203296d624f9c2317c309c0e02b468e':
  Clarified documentation as requested by API review
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
Julia Reynolds
48034f89b7 Prevent apps without DND access from toggling DND via AudioService.
Bug: 25395278
Change-Id: Id72830607b01a43848d1261292e5835315ef70d0
2016-03-16 09:33:02 -04:00
Nicolas Prevot
36ac3b8692 Merge "Update documentation of DevicePolicyManager.isProvisioningAllowed." into nyc-dev am: c25c903
am: 5490ba7

* commit '5490ba72794906a1b70d631cf71e6afd4d5836f4':
  Update documentation of DevicePolicyManager.isProvisioningAllowed.
2016-03-16 12:12:50 +00:00
Nicolas Prevot
5490ba7279 Merge "Update documentation of DevicePolicyManager.isProvisioningAllowed." into nyc-dev
am: c25c903

* commit 'c25c9032ffdca20a4080db5a1fe1e771af9256f6':
  Update documentation of DevicePolicyManager.isProvisioningAllowed.
2016-03-16 12:10:27 +00:00
Nicolas Prévot
c25c9032ff Merge "Update documentation of DevicePolicyManager.isProvisioningAllowed." into nyc-dev 2016-03-16 12:05:35 +00:00
Esteban Talavera
96895cae3e Clarified documentation as requested by API review
Bug: 27532433
Change-Id: I5fada6c0a4636528393308d5ce098cd0398e5ff5
2016-03-16 12:00:40 +00:00
Tony Mak
611bff36f8 Fix NotificationListenerService fail to mirror work notification am: 4dc008c
am: 63dbf9c

* commit '63dbf9c2165ae7963d857e396237864ebceab3ee':
  Fix NotificationListenerService fail to mirror work notification
2016-03-16 11:30:57 +00:00
Tony Mak
63dbf9c216 Fix NotificationListenerService fail to mirror work notification
am: 4dc008c

* commit '4dc008cda2980fabb6acbf8a3b7096d1090ee36f':
  Fix NotificationListenerService fail to mirror work notification
2016-03-16 11:28:35 +00:00
Tony Mak
4dc008cda2 Fix NotificationListenerService fail to mirror work notification
1. Instead of getting application info in runtime, just retrieve the
   one in the context to avoid cross user operation.

2. Functions in PackageManager that retrieve badged icon now return
   badged icon if the targer user is managed profile instead of checking
   whether target user is a managed profile of the user in mContext.

3. Relax the restriction of getUserInfo, if the caller is asking a user
   in the same profile group or having the manage user permission, we let
   it go.

Bug: 26469166

Change-Id: Ia1ffc5743f7d94bd489cdb7571eaed51499ebdd9
2016-03-16 10:49:02 +00:00
Sudheer Shanka
bbb3ff2b2a Flush package restriction changes for a user.
Change-Id: I7c4481f820b6b368487d00de6c783e64cec99f4b
2016-03-16 01:42:23 +00:00
Christopher Tate
10be4e9034 Lower the minimum period for periodic jobs to 15 minutes
Also make the minimum flex & period available via method call
rather than as hardcoded API constants.

Bug 27619643

Change-Id: Ib4afa427e9b21e13085d245e45b05d70d99724d4
2016-03-15 17:52:29 -07:00
Suprabh Shukla
0e2a53e60e Merge "Updating javadoc for DPM apis" into nyc-dev am: ff29237e89
am: ccf0c799b7

* commit 'ccf0c799b71bb8e229f2804e4f07d2dda6cddb4c':
  Updating javadoc for DPM apis
2016-03-15 23:25:42 +00:00
Suprabh Shukla
ccf0c799b7 Merge "Updating javadoc for DPM apis" into nyc-dev
am: ff29237e89

* commit 'ff29237e895188e99106899806613aaa01656fdd':
  Updating javadoc for DPM apis
2016-03-15 23:23:19 +00:00
Peng Xu
9ff7d22354 Exposing Context Hub service.
Adding the Context hub service. This is the service that exposes
the context hub HAL to the system. The API exposed is a System API.

Change-Id: I854141714ecd21f6386e6b15b7bc9a997483ccf6
2016-03-15 15:18:56 -07:00