Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237,713 Commits 3 Branches 0 Tags
c49a5f37c8613fdc594c9a052d241d6c6b4e1608
Commit Graph

62145 Commits

Author SHA1 Message Date
Roshan Pius
c49a5f37c8 Merge "Fix a bug in ControllerActivityCounter" into nyc-dev 
am: 85eb7a9

* commit '85eb7a97ef59a83f45208737ac83d4b3ea8f7a2c':
  Fix a bug in ControllerActivityCounter
 2016-03-16 15:11:56 +00:00
Roshan Pius
85eb7a97ef Merge "Fix a bug in ControllerActivityCounter" into nyc-dev 2016-03-16 15:05:14 +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
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
Tomasz Mikolajewski
08caebb5d1 Update docs for ACTION_QUICK_VIEW. 
am: fe023137d0

* commit 'fe023137d0b33e30d0428132e6212ea4d0df8b5c':
  Update docs for ACTION_QUICK_VIEW.
 2016-03-16 02:14:28 +00:00
Tomasz Mikolajewski
fe023137d0 Update docs for ACTION_QUICK_VIEW. 
Bug: 27531273
Change-Id: I917ca16c14db20e6a2773018e00a61ff5fcf7ecd
 2016-03-16 02:08:53 +00:00
Steve McKay
5abf7de9bd Merge "Add FLAG_PARTIAL. Partial files can\'t be copied." into nyc-dev 
am: 709be25f04

* commit '709be25f04fd390b220eec1c0f5578df3be2b17e':
  Add FLAG_PARTIAL. Partial files can't be copied.
 2016-03-16 01:41:13 +00:00
Steve McKay
709be25f04 Merge "Add FLAG_PARTIAL. Partial files can't be copied." into nyc-dev 2016-03-16 01:37:08 +00:00
Adam Powell
c3b1f35153 Merge "Add View#onVisibilityAggregated" into nyc-dev 
am: 3c8702dd81

* commit '3c8702dd8113a780e6fd7240d8dfe8e82aaa283e':
  Add View#onVisibilityAggregated
 2016-03-16 00:24:59 +00:00
Adam Powell
3c8702dd81 Merge "Add View#onVisibilityAggregated" into nyc-dev 2016-03-16 00:22:22 +00:00
Steve McKay
168e464812 Add FLAG_PARTIAL. Partial files can't be copied. 
This allows us to exclude in-progress downloads from copy.
Will update Downloads in a followup CL to flag active downloads.

Bug: 27526321
Change-Id: I50d1db5cfb69bc6b47e10cc0f520a51e3d3cb43e
 2016-03-15 16:51:23 -07:00
Joseph Pirozzo
f12a22cd53 Merge "Add BluetoothProfile for PBAP PCE role." into nyc-dev 
am: d91859d246

* commit 'd91859d2460c45943568a98dab1950d53a4af608':
  Add BluetoothProfile for PBAP PCE role.
 2016-03-15 23:28:01 +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
Joseph Pirozzo
d91859d246 Merge "Add BluetoothProfile for PBAP PCE role." into nyc-dev 2016-03-15 23:21:12 +00:00
Adam Powell
41d9690c3e Add View#onVisibilityAggregated 
There's a common misconception (even across the framework) that
View#onVisibilityChanged determines and reports visibility on 'this'
up to the changed view and the total visibility within the
window. Knowing this is useful for things like starting/stopping
animations. onVisibilityChanged only reports the visibility for the
specific changed view, not the effects that would have down the tree.

Add onVisibilityAggregated to report what some code thought it was
getting already, and move ImageView and ProgressBar over to using it.

Bug 27461617

Change-Id: I433f41de453e27a53f907f1d9805350f30f31de9
 2016-03-15 16:20:11 -07:00
Suprabh Shukla
ff29237e89 Merge "Updating javadoc for DPM apis" into nyc-dev 2016-03-15 23:18:20 +00:00
Tao Bao
688b9e8a06 Merge "Don\'t reboot into recovery if block map file is missing." into nyc-dev 
am: 1b478f756a

* commit '1b478f756a4bf17f9a79acf1b3a7b14c253e6261':
  Don't reboot into recovery if block map file is missing.
 2016-03-15 22:05:53 +00:00
Tao Bao
1b478f756a Merge "Don't reboot into recovery if block map file is missing." into nyc-dev 2016-03-15 22:02:10 +00: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
Makoto Onuki
de40929c65 Merge "Fix launcher side callback" into nyc-dev 
am: ed1b89878b

* commit 'ed1b89878bdf1fa9b5e4b2dfc766383d531d4315':
  Fix launcher side callback
 2016-03-15 21:11:56 +00:00
Makoto Onuki
ed1b89878b Merge "Fix launcher side callback" into nyc-dev 2016-03-15 21:02:48 +00: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
Makoto Onuki
4dbe0ded4a Fix launcher side callback 
- Fix crash in work profile case
- Calculate shortcuts for each caller
- Add tests

Bug 27548047

Change-Id: I1a5b6a96956abac75d01eb5cc1cec9a9e8e379a3
 2016-03-15 12:38:41 -07: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
Ronghua Wu
dbbdb608c0 Merge "core: add hdr capabilities to display" into nyc-dev 
am: a052cbda80

* commit 'a052cbda8099d6665e77076ae86a3f1265306caa':
  core: add hdr capabilities to display
 2016-03-15 17:47:42 +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
Ronghua Wu
a052cbda80 Merge "core: add hdr capabilities to display" into nyc-dev 2016-03-15 17:40:14 +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
Tao Bao
36baafe92c Don't reboot into recovery if block map file is missing. 
We added a third parameter to RecoverySystem.installPackage() to let the
caller to indicate the package has been processed (uncrypt'd). We need
to ensure the caller's claim is true by checking the existence of the
block map. Otherwise the device will fail for sure when booting into
recovery.

Bug: 27620932
Change-Id: I6325455253480055f14eb0cf020689ac37328602
 2016-03-15 10:36:19 -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
Ian Pedowitz
0f0fba787c Merge "Revert "Permissions: Get rid of GET_ACCOUNTS"" into nyc-dev 
am: 440ef18fe7

* commit '440ef18fe7dcfaff28fad0137f4abe4235381e05':
  Revert "Permissions: Get rid of GET_ACCOUNTS"
 2016-03-15 17:15:59 +00:00
Ian Pedowitz
440ef18fe7 Merge "Revert "Permissions: Get rid of GET_ACCOUNTS"" into nyc-dev 2016-03-15 17:09:53 +00:00
Ian Pedowitz
358e51f3d1 Revert "Permissions: Get rid of GET_ACCOUNTS" 
This reverts commit d39600585b.

Bug: 27665091
Change-Id: I7d017ba7062ac594225229436d2877c7d21fb065
 2016-03-15 17:08:27 +00: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
Kirill Grouchnikov
c3aa518546 Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev 
am: a487ab1368

* commit 'a487ab13682d6e60c6ff41a5b9f708b752efc776':
  Remove tracking of all drawables in ViewOverlay.clear()
 2016-03-15 16:30:11 +00:00
Kirill Grouchnikov
a487ab1368 Merge "Remove tracking of all drawables in ViewOverlay.clear()" into nyc-dev 2016-03-15 16:25:50 +00:00
Alan Viverette
0269baa345 Merge "Push flags from top-level TypedValue into ComplexColor changing configs" into nyc-dev 
am: f068cff176

* commit 'f068cff1761a2876587caa7ca6978a848198439a':
  Push flags from top-level TypedValue into ComplexColor changing configs
 2016-03-15 14:41:52 +00:00