Commit Graph

7614 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Suprabh Shukla
34d92ef631 Updating javadoc for DPM apis
Added @throws tag in the javadoc for many APIs which might throw a
SecurityException in cases when such information might be useful for the
caller. E.g. when the caller has to be a device owner or must request
certain policies before making the API call.

Bug: b/27532288
Change-Id: I18e1a49a5e86a0322c035996ed7e9c3217da78c8
2016-03-15 14:43:46 -07:00
Mahaver Chopra
648c70a3b7 Merge "Update DPM.reboot with new restriction" into nyc-dev
am: 8a8e8ea19a

* commit '8a8e8ea19a825dd45117909df2f0140ca20565e7':
  Update DPM.reboot with new restriction
2016-03-15 19:56:48 +00:00
Mahaver Chopra
8a8e8ea19a Merge "Update DPM.reboot with new restriction" into nyc-dev 2016-03-15 19:48:33 +00:00
Mahaver Chopra
1216ae5d02 Update DPM.reboot with new restriction
DPM.reboot() should not be called when there is an ongoing call on the
device.

Bug:27531799
Change-Id: Idc1fa4c7aa79b20ec9c2afcccf855455ee316787
2016-03-15 19:46:05 +00:00
Sudheer Shanka
019a784c14 Merge "Show admin support dialog if app is suspended." into nyc-dev
am: b5a4d9605f

* commit 'b5a4d9605f6ee009984165f1c894b3949dc8417a':
  Show admin support dialog if app is suspended.
2016-03-15 18:58:38 +00:00
Sudheer Shanka
b5a4d9605f Merge "Show admin support dialog if app is suspended." into nyc-dev 2016-03-15 18:50:01 +00:00
Dimitry Ivanov
fd167d0572 Merge "Restore fix for native activity without a java-code" into nyc-dev
am: 53ea5a2f07

* commit '53ea5a2f071909e10e21b53ca974d2016c400173':
  Restore fix for native activity without a java-code
2016-03-15 18:29:15 +00:00
Dimitry Ivanov
53ea5a2f07 Merge "Restore fix for native activity without a java-code" into nyc-dev 2016-03-15 18:23:03 +00:00
Andrii Kulian
7db5f3b4c5 Merge "Update ActivityOptions#setLaunchBounds() docs" into nyc-dev
am: 68b36ee07b

* commit '68b36ee07b6f8c184e0b9f297ae672b5685a978c':
  Update ActivityOptions#setLaunchBounds() docs
2016-03-15 18:22:07 +00:00
Andrii Kulian
68b36ee07b Merge "Update ActivityOptions#setLaunchBounds() docs" into nyc-dev 2016-03-15 18:19:13 +00:00
Nicolas Prevot
797fca5fd9 Update documentation of DevicePolicyManager.isProvisioningAllowed.
Do not mention the possibility of races for consistency with
other methods.

BUG:27532561
Change-Id: If81e8478742458456d1f2a23c61dded3e3a4f876
2016-03-15 17:44:40 +00:00
Sudheer Shanka
7a9c34bd7a Show admin support dialog if app is suspended.
Bug: 26922950
Change-Id: I21f048873244df52d14910cc01a658af476d9149
2016-03-15 10:40:04 -07:00
Dimitry Ivanov
43b28b17d2 Restore fix for native activity without a java-code
The regression was introduced by 39bfee5e36
which undid the fix to classloader construction.

This commit reapplies the fix from b9c9026bdd

Bug: http://b/27250344
Change-Id: I6c341d911ba0f311c63e380dd9dd064ba2faf391
2016-03-15 10:17:35 -07:00
Adam Powell
d2f9090c16 Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev
am: 421806380d

* commit '421806380dcb971755caf4e61756a38566469f6e':
  Un-deprecate Activity#onRetainNonConfigurationInstance
2016-03-15 16:57:22 +00:00
Adam Powell
421806380d Merge "Un-deprecate Activity#onRetainNonConfigurationInstance" into nyc-dev 2016-03-15 16:51:03 +00:00
Michal Karpinski
295a0bce25 Merge "Addressing API council feedback for remote bugreports" into nyc-dev
am: 57f8462f56

* commit '57f8462f56eb2311bb409fd09848117523d3b5aa':
  Addressing API council feedback for remote bugreports
2016-03-15 14:13:56 +00:00
Michal Karpinski
37cfe71693 Addressing API council feedback for remote bugreports
In DeviceAdminReceiver fixed a broken link in javadocs and improved
javadocs for bugreport error codes.

Bug: 27532425
Change-Id: I6cf90b4109065615778e69ea9d21b1869841593b
2016-03-15 11:35:34 +00:00
Andrii Kulian
8f1701d9dc Update ActivityOptions#setLaunchBounds() docs
Update docs to provide more info about parameter format.

Bug: 27364884
Change-Id: I04dd2e868d64d3f023fcaa4891b40b60a2f549d6
2016-03-15 00:02:59 -07:00
Adrian Roos
8fa819399b Merge "Don\'t show wallpaper when backdrop is visible" into nyc-dev
am: 7400f82699

* commit '7400f82699c76618d5ca24d6528580afb4695dbf':
  Don't show wallpaper when backdrop is visible
2016-03-15 03:30:01 +00:00
Adrian Roos
7400f82699 Merge "Don't show wallpaper when backdrop is visible" into nyc-dev 2016-03-15 03:26:02 +00:00
Adrian Roos
d5c2db630f Don't show wallpaper when backdrop is visible
Hides the wallpaper when it's not needed and fixes
the unlock animation to not unnecessairly show the
wallpaper if neither the Keyguard nor the underlying
app need it.

Also fixes a bug where the enter animation had a background
set, which led to uglyness when no wallpaper is involved.

Bug: 27533740
Change-Id: I667c6f7ca6c0e1ff7e9f793c6ddc13f6da8387b1
2016-03-14 18:55:41 -07:00
Oren Blasberg
086c22442b Merge "Fix constant name in WallpaperManager javadoc." into nyc-dev
am: cea9f353f7

* commit 'cea9f353f79d2c367a30fa84ceca524e5eacce08':
  Fix constant name in WallpaperManager javadoc.
2016-03-14 20:47:55 +00:00
Oren Blasberg
cea9f353f7 Merge "Fix constant name in WallpaperManager javadoc." into nyc-dev 2016-03-14 20:43:43 +00:00
Jeff Davidson
cb4ad1548e Merge "NetworkStats.Bucket API polish." into nyc-dev
am: 1c0c14febf

* commit '1c0c14febfaab3fac0239328e2f3b0aaeb9bf56d':
  NetworkStats.Bucket API polish.
2016-03-14 19:35:48 +00:00
Jeff Davidson
1c0c14febf Merge "NetworkStats.Bucket API polish." into nyc-dev 2016-03-14 19:30:23 +00:00
Adam Powell
c4df6bc4dd Un-deprecate Activity#onRetainNonConfigurationInstance
This is still useful in some situations, FragmentActivity in the
support lib uses it to implement retained instance fragments, and it
really irks some people's linters.

Hi, Jake!

Bug 27642432

Change-Id: Id59f4895bdb09f7d629d081c16219e037e71bf33
2016-03-14 12:15:28 -07:00
Jeff Davidson
1f7e05eda6 NetworkStats.Bucket API polish.
-Add @IntDef constants for STATE_ and ROAMING_.
-Expand docs for ROAMING_ constants.
-Use ROAMING_NO/YES instead of ROAMING_DEFAULT/ROAMING.

Bug: 27531260
Change-Id: I54ecfb4148caa549214df0bee9983036ffa4cb55
2016-03-14 11:24:12 -07:00
Oren Blasberg
2eee8c6e0e Fix constant name in WallpaperManager javadoc.
It should be FLAG_SET_LOCK, not FLAG_SET_LOCK_WALLPAPER
(same thing for SYSTEM).

Change-Id: I1a7a91edb3e67103b5584affc7d46a98d9a735b2
2016-03-14 10:06:08 -07:00
Makoto Onuki
d0a90344fd Merge "Add ENCRYPTION_STATUS_ACTIVE_PER_USER to..." into nyc-dev
am: c070a099f5

* commit 'c070a099f5e96d7d6eb4553b9d4591708bab20af':
  Add ENCRYPTION_STATUS_ACTIVE_PER_USER to...
2016-03-14 15:59:49 +00:00
Amith Yamasani
c070a099f5 Merge "Add ENCRYPTION_STATUS_ACTIVE_PER_USER to..." into nyc-dev 2016-03-14 15:54:19 +00:00
Dianne Hackborn
40b0005cc7 Merge "Fix issue #27530395: API Review: JobInfo.Builder" into nyc-dev
am: 20c9aa735e

* commit '20c9aa735eb7f938c2fca1cac3ff74cd41079412':
  Fix issue #27530395: API Review: JobInfo.Builder
2016-03-12 02:16:13 +00:00
Dianne Hackborn
20c9aa735e Merge "Fix issue #27530395: API Review: JobInfo.Builder" into nyc-dev 2016-03-12 02:12:12 +00:00
Christopher Tate
3422c197a8 Merge "Once restored, the wallpaper needs to actually draw" into nyc-dev
am: fcbe17e1e0

* commit 'fcbe17e1e0a0a487ff5f41a32ff6bb7d056e5a76':
  Once restored, the wallpaper needs to actually draw
2016-03-12 01:58:48 +00:00
Chris Tate
fcbe17e1e0 Merge "Once restored, the wallpaper needs to actually draw" into nyc-dev 2016-03-12 01:55:19 +00:00