Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,354 Commits 3 Branches 0 Tags
fd84a7af4f221d36e0ffc79136ebfd0ce50a67e6
Commit Graph

8052 Commits

Author SHA1 Message Date
Tony Mak
cbd3c79f3b Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev am: a01c1f0 
am: 90bdf5a

* commit '90bdf5acb75bcdb8800e699443e9d3f0d855a5fd':
  xxxTrustAgentConfiguration should be supported in the parent DPM instance

Change-Id: I9a6c8809cc9c6ccf105048bdb075bf7cf8c8db67
 2016-04-06 18:47:02 +00:00
Tony Mak
90bdf5acb7 Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev 
am: a01c1f0

* commit 'a01c1f0d90def31de9bdd21bada11a3dfc0444b0':
  xxxTrustAgentConfiguration should be supported in the parent DPM instance

Change-Id: I75cb2133f8f54ccf938fb5d107a8dc8f2dcd6f9c
 2016-04-06 18:44:06 +00:00
Tony Mak
a01c1f0d90 Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev 2016-04-06 18:39:21 +00:00
Adam Powell
1383a09702 Merge "Fragment#setUserVisibleHint guard" into nyc-dev am: c0eb067 
am: 237ce73

* commit '237ce73ed9c93d08ed80cdebd9e6319f75ea92b3':
  Fragment#setUserVisibleHint guard

Change-Id: I93dcbdd5c61b27a1440910d5653277015ca92dbb
 2016-04-06 17:40:23 +00:00
Adam Powell
237ce73ed9 Merge "Fragment#setUserVisibleHint guard" into nyc-dev 
am: c0eb067

* commit 'c0eb067ceb25f1c6585d18874f75afd151826e2b':
  Fragment#setUserVisibleHint guard

Change-Id: If30524bf81f10649fd0d8a3b652523f1d0a62e1a
 2016-04-06 17:34:34 +00:00
Adam Powell
c0eb067ceb Merge "Fragment#setUserVisibleHint guard" into nyc-dev 2016-04-06 17:26:53 +00:00
Robin Lee
c195fd649f Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev am: 589b855 
am: 0694d00

* commit '0694d0095cd0541ba65ff783a60e8bd2621c0f4a':
  Remove bool return from setAlwaysOnVpnPackage

Change-Id: Iee41dd36989da78becf5f4d13be7a0fcd72ff1bb
 2016-04-06 17:08:37 +00:00
Robin Lee
0694d0095c Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev 
am: 589b855

* commit '589b855719ce89ba68ce1a93f15a4c79a2461adc':
  Remove bool return from setAlwaysOnVpnPackage

Change-Id: I560e03e8460401eb74170d5bf56607e3e47c94fb
 2016-04-06 17:05:38 +00:00
Robin Lee
589b855719 Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev 2016-04-06 17:01:24 +00:00
Adam Powell
3e10ae927c Fragment#setUserVisibleHint guard 
Bug 28026606

Change-Id: I109bce6ecd35feaa045b61a7226b2a19344d2cda
 2016-04-06 09:57:40 -07:00
Julia Reynolds
9800815036 Merge "Documentation update for interruption filters." into nyc-dev am: fa305fc 
am: 7f713ab

* commit '7f713ab1c3aa9b3189b346df38d56c75ee72e8db':
  Documentation update for interruption filters.

Change-Id: If1b75dddbe82dc2c7473088cb80e6042bafd2b9e
 2016-04-06 15:43:53 +00:00
Julia Reynolds
7f713ab1c3 Merge "Documentation update for interruption filters." into nyc-dev 
am: fa305fc

* commit 'fa305fcc6ba8f4d95b0ee33bbe8c6d9e371096e1':
  Documentation update for interruption filters.

Change-Id: I980f35331785a31275a7d0bf251cfa1a6fcfc34a
 2016-04-06 15:41:13 +00:00
Julia Reynolds
fa305fcc6b Merge "Documentation update for interruption filters." into nyc-dev 2016-04-06 15:34:09 +00:00
Robin Lee
ee5eb934e3 Remove bool return from setAlwaysOnVpnPackage 
Bug: 27533151
Change-Id: I4c656488e69cb5247dbb9cfd62d6f6f7043f9a90
 2016-04-06 16:30:22 +01:00
Julia Reynolds
dd0605b052 Documentation update for interruption filters. 
Bug: 27901142
Change-Id: I977f7dc4010dc826e06dfb01ad6db68380b80fde
 2016-04-06 10:33:14 -04:00
Benjamin Franz
7f682c6ffb Merge "Document which APIs are callable on the parent instance" into nyc-dev am: 4a53c8e 
am: 9c17111

* commit '9c17111358687b1e9631f30b06efc3104ca27a95':
  Document which APIs are callable on the parent instance

Change-Id: I2bb8e778b435e39c1b13903771550def4e1bde13
 2016-04-06 12:25:40 +00:00
Benjamin Franz
9c17111358 Merge "Document which APIs are callable on the parent instance" into nyc-dev 
am: 4a53c8e

* commit '4a53c8e70253928bf89913cb313de47450d0782f':
  Document which APIs are callable on the parent instance

Change-Id: I4cd3ca078d47bcb6c3f1d34f92224e5c8eb3e05f
 2016-04-06 12:23:01 +00:00
Benjamin Franz
4a53c8e702 Merge "Document which APIs are callable on the parent instance" into nyc-dev 2016-04-06 12:17:26 +00:00
Benjamin Franz
66b45f01ff Document which APIs are callable on the parent instance 
In DPM it is possible to retrieve a parent instance to set policies
that are applied to the profile parent. Extend the javadoc to clarify
which APIs are actually callable on the parent instance.

Bug: 27532279
Change-Id: I7ed40f8c3c7c3089283489bff41a04c70239d5a4
 2016-04-06 11:59:49 +01:00
Chris Tate
1f91a937f7 Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev am: 71f4e14 
am: 1ecb55a

* commit '1ecb55a2beacb056f5e1cd58a748fd10f8238ac4':
  API feedback: clarify onQuotaExceeded() documentation

Change-Id: Ia5a1f1a467edd1f7dd2d025f70018291126ffce6
 2016-04-05 23:32:36 +00:00
Christopher Tate
1ecb55a2be Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev 
am: 71f4e14

* commit '71f4e1440202e884f99c00a1012669a5b43c4078':
  API feedback: clarify onQuotaExceeded() documentation

Change-Id: I77d195725db157eb22c48f5c6b28dfe30dad2f2b
 2016-04-05 23:24:59 +00:00
Chris Tate
71f4e14402 Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev 2016-04-05 21:51:20 +00:00
George Mount
8ade4ed2af Merge "Restore fragment transaction animation state information." into nyc-dev am: dc63f7c6 
am: 5f2be08

* commit '5f2be085d2179e3409d074a4d4cca98c5db71582':
  Restore fragment transaction animation state information.

Change-Id: I6e63aba83c05bc8820f3776496138413e3091b8b
 2016-04-05 17:44:26 +00:00
George Mount
5f2be085d2 Merge "Restore fragment transaction animation state information." into nyc-dev 
am: dc63f7c6

* commit 'dc63f7c6248276d003d949dbbe407aafd5e7c6bf':
  Restore fragment transaction animation state information.

Change-Id: I4eb87247e789034b2c468bd4764e4d1c9c44ab09
 2016-04-05 17:36:11 +00:00
George Mount
dc63f7c624 Merge "Restore fragment transaction animation state information." into nyc-dev 2016-04-05 17:27:34 +00:00
Tony Mak
089d840383 xxxTrustAgentConfiguration should be supported in the parent DPM instance 
1. Fix trust agent config does not persist across reboot
2. xxxTrustAgentConfiguration now supported in parent DPM instance

Bug: 27601827

Change-Id: I6ea4a089bf590d6c44be40318f3a69c35c54f796
 2016-04-05 17:42:55 +01:00
Robin Lee
1187418a61 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev am: 691b1a6 
am: 892af97

* commit '892af97b0b62a404f1f14a1824a2398c5e6927d6':
  Switch to work challenge if MP calls resetPassword

Change-Id: I8381ce2e4cbe0de6e8db4cd4c9dac853cf94fa3c
 2016-04-05 14:16:51 +00:00
Robin Lee
892af97b0b Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 
am: 691b1a6

* commit '691b1a6005ed373ad75361aa5a1bd120f138f15c':
  Switch to work challenge if MP calls resetPassword

Change-Id: I705c5a52e2a2cae96e0c0df8a2ec50c9b8ae2300
 2016-04-05 14:13:30 +00:00
Robin Lee
691b1a6005 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 2016-04-05 14:04:40 +00:00
Adam Lesinski
e818bb782c Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev am: a149c42 
am: ea0186c

* commit 'ea0186c2c1d4184f2469f87ac94a851c7828818c':
  Fix issue with overridden configuration in onConfigurationChanged

Change-Id: I8dff44a0a0f986446d92c4791aa757c66cd97473
 2016-04-05 02:30:45 +00:00
Adam Lesinski
ea0186c2c1 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 
am: a149c42

* commit 'a149c42071197a7759a652accb399bc58ed62bcd':
  Fix issue with overridden configuration in onConfigurationChanged

Change-Id: I034e9ad42bf8e94ca97fd536ba1498fe19f01118
 2016-04-05 02:28:26 +00:00
Adam Lesinski
a149c42071 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 2016-04-05 02:22:52 +00:00
Adam Lesinski
3ad1b4899f Fix issue with overridden configuration in onConfigurationChanged 
When using applyOverrideConfiguration, subsequent callbacks to
onConfigurationChanged didn't take into account the locally overridden
configuration. This patches the incoming configuration to match
what is expected by the application.

Bug:27644297
Change-Id: I3a090e9862a56470d999aa0aa4d5bae29f533a11
 2016-04-04 15:24:48 -07:00
Christopher Tate
d43879c5e4 API feedback: clarify onQuotaExceeded() documentation 
Bug 27530914

Change-Id: I5d185cfe9c7e0392a26d84e0e60d210ed6755016
 2016-04-04 12:54:43 -07:00
George Mount
41fb99480c Restore fragment transaction animation state information. 
Bug 17487986

Change-Id: Ic5154b0dd00f07804a1008f8b9f8328f1b2ec06c
 2016-04-04 12:32:44 -07:00
Jeff Sharkey
a823c4e271 Merge "Support direct-boot tests." into nyc-dev am: 7d718bb 
am: 7fc8b9c

* commit '7fc8b9ce48a74011befdaf3be15a2cc952398433':
  Support direct-boot tests.

Change-Id: I946f2a960ab0cfb0f56477a3d5e6da07d17aa5bd
 2016-04-03 04:09:43 +00:00
Jeff Sharkey
7fc8b9ce48 Merge "Support direct-boot tests." into nyc-dev 
am: 7d718bb

* commit '7d718bb252fe2bdee0c9c728a1e6e4892deb8ac7':
  Support direct-boot tests.

Change-Id: I65205c39260d68130de4787eb2be724006ff8a66
 2016-04-03 04:07:02 +00:00
Jeff Sharkey
7d718bb252 Merge "Support direct-boot tests." into nyc-dev 2016-04-03 03:59:23 +00:00
Jeff Sharkey
b5e89c6deb Support direct-boot tests. 
Add shell commands to check on current FBE status and system ready
status.  Mark variables without first-class locking as volatile.

Fix bug where UI automation would crash while device was locked by
marking it as forced direct-boot aware.

Bug: 26498834
Change-Id: Ib4dfb9350925e5413f93a09baacf84c62f2ba0ea
 2016-04-02 19:31:19 -06:00
Adam Powell
029fd30188 Merge "Don\'t performPendingDeferredStart on fragments that aren\'t added" into nyc-dev am: 7af7e3d 
am: eeb25cb

* commit 'eeb25cb544390bc3814481b84196d1b9b1c12e4f':
  Don't performPendingDeferredStart on fragments that aren't added

Change-Id: Ie4456bae2cc5051259f274cfdcf56a15cffdc875
 2016-04-02 01:31:45 +00:00
Adam Powell
eeb25cb544 Merge "Don\'t performPendingDeferredStart on fragments that aren\'t added" into nyc-dev 
am: 7af7e3d

* commit '7af7e3d18eeaa5a419192f013253afc23b5f166d':
  Don't performPendingDeferredStart on fragments that aren't added

Change-Id: I0c96bc3b550fbb19358b4694d9a662c85a2e9095
 2016-04-02 01:27:09 +00:00
Adam Powell
7af7e3d18e Merge "Don't performPendingDeferredStart on fragments that aren't added" into nyc-dev 2016-04-02 01:09:00 +00:00
George Mount
175cebd77a Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev am: 1747022 
am: 5e61e92

* commit '5e61e92f118f6232fd11e4cbbcc6d61ec28c6826':
  Removed improper check on mCalledExitCoordinator.

Change-Id: I2a1c1719f390a0f65787255857f467196352cd8b
 2016-04-01 23:23:44 +00:00
George Mount
5e61e92f11 Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev 
am: 1747022

* commit '1747022004c55a823d892f78a03952571d7e3c2b':
  Removed improper check on mCalledExitCoordinator.

Change-Id: Idc64dc39fe704e382f598ca6102e452e079c6859
 2016-04-01 23:19:10 +00:00
George Mount
1747022004 Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev 2016-04-01 23:06:59 +00:00
Joe LaPenna
cc5bb55a6a Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev am: f38aa6b 
am: 6a935d1

* commit '6a935d1aa829bd225bb1f40f8c60ee7dcd89b51e':
  Fix NPE in AlarmManager.cancel(...)

Change-Id: I2df6b1a266da854752b4f06aff1850eb6adcc010
 2016-04-01 22:39:49 +00:00
Joe LaPenna
6a935d1aa8 Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev 
am: f38aa6b

* commit 'f38aa6ba2b85e24d8bc08b96a456a01d03d22f5f':
  Fix NPE in AlarmManager.cancel(...)

Change-Id: I6cb099702b9a0681e8f5c939487f3587af73e656
 2016-04-01 22:29:34 +00:00
Adam Powell
b963c99c3a Don't performPendingDeferredStart on fragments that aren't added 
Framework edition

When setting a user visibility hint on a fragment it was possible to
have a FragmentManager already set due to a transaction being composed
but before the commit, so only checking that we have one isn't
sufficient for determining whether we should perform a pending
deferred start. This could happen easily with ViewPager adapters. Use
isAdded() instead.

Also fix a bug where we could set our internal tracking of fragments
that need a deferred start incorrectly.

Bug 27814550

Change-Id: I3be65728650c48d27a3a9dd4ca15f52006d14ab9
 2016-04-01 15:29:04 -07:00
Joe LaPenna
f38aa6ba2b Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev 2016-04-01 22:22:46 +00:00
Joe LaPenna
33ee4bf18b Fix NPE in AlarmManager.cancel(...) 
If AlarmManager.cancel is called before any component has had a chance
to register an alarm, sWrappers will not have been set, as it is only
initialized in setImpl.

When cancelling an alarm and sWrappers does not exist, log a warning and
return early.

BUG: 27972657
Change-Id: Ied10719ba1d154f97eecfc32f429fd9ce39bf747
 2016-04-01 14:07:35 -07:00