Commit Graph

7557 Commits

Author SHA1 Message Date
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
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
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
7af7e3d18e Merge "Don't performPendingDeferredStart on fragments that aren't added" into nyc-dev 2016-04-02 01:09:00 +00:00
George Mount
1747022004 Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev 2016-04-01 23:06:59 +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
George Mount
056b7d5403 Removed improper check on mCalledExitCoordinator.
Bug 27969302

mCalledExitCoordinator can be nulled before the onResume is called,
so it cannot be used to determine whether or not the Activity is
a caller or called.

Change-Id: Ie3696ed59b89cfc8c6145d22bc230111f0813701
2016-04-01 13:19:35 -07:00
Alan Viverette
f04580852d Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev 2016-04-01 20:17:16 +00:00
Alan Viverette
48728c2179 Clean up Dialog annotations, lint warnings, and declarations
No functional changes.

Change-Id: If38c9d829d83e762f8c2d05c2fe060c56804b38f
2016-04-01 15:00:10 -04:00
Adam Lesinski
ce2a399032 Merge "ResourcesManager: Fix a cache issue" into nyc-dev 2016-04-01 18:53:22 +00:00
Adam Lesinski
0cd9a7ea3b ResourcesManager: Fix a cache issue
Forgot to cache the creating of ResourcesImpl during an Activity
override config update.

Bug:27644297
Change-Id: I65d9086f6d32f5adc7231aa3a1797d4f00c4b9a9
2016-04-01 11:48:10 -07:00
Alan Viverette
228137fa26 Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev 2016-04-01 18:22:20 +00:00
Alan Viverette
a9a75f506e Refactor DatePickerDialog constructors to avoid early callback
Bug: 27475444
Change-Id: I2536f969ca734f3977163305c1d33ee0e2e222fc
2016-04-01 13:22:10 -04:00
Clara Bayarri
032a76f94b Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev 2016-04-01 16:18:28 +00:00
Robin Lee
ce5c4009cf Switch to work challenge if MP calls resetPassword
If the profile owner wants to set a lock screen for a profile which they
created, we should let them. This will cancel any lock screen
unification that has been set up.

Attempting to clear the password will continue to throw
SecurityException if called from a managed profile.

Bug: 26682008
Change-Id: Ia09aef879a21c074ccb517905e43f62696837998
2016-04-01 16:12:32 +00:00
Kenny Guy
fa7b6723e6 Merge "Allow PO to check if it is in a managed profile." into nyc-dev 2016-04-01 14:23:51 +00:00
Clara Bayarri
89203de878 Remove unused import for KeyboardShortcutGroup
Left it in accidentally when removing default method.

Change-Id: I6af0712624ffaefff4cb4ad2a9e5a86d7104d2e7
2016-04-01 14:40:34 +01:00
Chris Tate
9c4ec06988 Merge "API review: WallpaperManager" into nyc-dev 2016-03-31 19:24:42 +00:00
Robin Lee
f1fe782e91 Merge "API to approve CA certificates" into nyc-dev 2016-03-31 18:26:32 +00:00
Joe Onorato
d0f83b7bca Merge "Include process state in association tracking" into nyc-dev 2016-03-31 17:09:24 +00:00
Robin Lee
2f7e1e487c API to approve CA certificates
Bug: 18224038
Change-Id: Id928872cd70dac5a5ecfdcd52150fe6dea544e3b
2016-03-31 18:06:44 +01:00
Kenny Guy
ffa3840cf3 Allow PO to check if it is in a managed profile.
Method was @hide because we only intended to add
managed users in a later release, however we added
createAndManageUser which allows it.

Bug: 27261765
Change-Id: I029f8ef35a3065f7fc598b5f854c8d8cdc9c555d
2016-03-31 16:40:57 +01:00
Andrei Stingaceanu
aa60469445 Merge "AfW - suspend apps - API polish" into nyc-dev 2016-03-31 10:57:58 +00:00
Michal Karpinski
31f59f1106 Merge "Adjusting javadocs for process logging" into nyc-dev 2016-03-31 09:56:24 +00:00
Jeff Sharkey
4afe32d493 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev 2016-03-31 03:46:14 +00:00
Jeff Sharkey
281c182cb8 Keep COLUMN_LOCAL_URI working for now.
Bug: 26515039
Change-Id: I48f3ef90443b01fb75a3852e5cfdd83a9bbcac0f
2016-03-30 19:46:42 -06:00
Sudheer Shanka
d2a968f9c3 Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev 2016-03-31 01:14:21 +00:00
Andrii Kulian
ac94586714 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev 2016-03-31 00:57:42 +00:00
Sudheer Shanka
549b969280 Return null value if getActiveAdminUncheckedLocked returns null.
- Split per user version of getUserRestrictions into a separate method
  in DPMS and make the per-user version return null if the admin
  parameter is not a valid one.
- Update isAccessibilityServicePermittedByAdmin and
  isInputMethodPermittedByAdmin to return false if the admin parameter
  is not a valid one.

Bug: 27909087
Change-Id: I6f4cae6552cbfe02dc4a92b04eeeddf0314e0974
2016-03-30 17:12:07 -07:00
Joe Onorato
05c9ecc08a Include process state in association tracking
Bug: 26165863
Change-Id: Ic1f3237d85dd9f9b55a412bc8609e60e6c2f3fd2
2016-03-30 16:55:25 -07:00
Lorenzo Colitti
7d4ed2f5ab Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev 2016-03-30 23:03:18 +00:00
Christopher Tate
edf7d04003 API review: WallpaperManager
- Rename FLAG_SET_* to simply FLAG_*
- Improve documentation

Bug 27365822

Change-Id: I10e85aeaa462a8ae092938c0ccd55d171f02c20a
2016-03-30 14:32:00 -07:00
Adam Lesinski
7f3f499887 Allow multiple Resources associated with an Activity
Previously it was assumed that one Resources object per Activity would be fine.
This proved to be incorrect, as methods like Context#createConfigurationContext()
expect to create a new Resources object that gets updated whenever the Activity Resources
get updated.

To fix this issue, there exists a master override configuration for each Activity. Subsequent
Resources created for an Activity will be based off that master override configuration, and
will be updated accordingly.

Bug:27644297
Bug:27604953
Change-Id: Idb3d851f55ee7981eec4e3fe28e2ea8d55f1192d
2016-03-30 14:27:11 -07:00
Roozbeh Pournader
48d8a39b71 Merge "Fix incorrect initial locale negotiation." into nyc-dev 2016-03-30 19:44:25 +00:00
Rubin Xu
5b7ca24f14 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev 2016-03-30 17:46:18 +00:00
Clara Bayarri
30fb053449 Merge "Change default work challenge background color" into nyc-dev 2016-03-30 16:13:00 +00:00
Clara Bayarri
8d0bd7fa63 Change default work challenge background color
Requested by UX

Bug: 27829562
Change-Id: I815c06784189e68b09e464e936521e82091c93c3
2016-03-30 17:12:08 +01:00
Seigo Nonaka
c14dd78a2c Fix incorrect initial locale negotiation.
It turned out that calling ResourceManager.setDefaultLocalesLocked
and ResourcesManager.applyConfigurationToResourcesLocked
can be called before the locale negotiation is ready.

To fix this issue, move ResourcesManager setup flow after creating
application context.

This also introduces RuntimeException for notifying developers the
initialize order.

Bug: 27567902
Change-Id: Iab7ea384b039fb649fb52d06d45b2bfae21f9a8a
2016-03-31 00:21:35 +09:00
Michal Karpinski
e0e1009820 Adjusting javadocs for process logging
Informing the pre-reboot logs may be empty and specifying that base APK hash is logged.

Bug: 27896341
Change-Id: I9011f6f6ebd0e20e5a4be86f6c5d33094212cc3d
2016-03-30 15:02:26 +01:00
Andrei Stingaceanu
b70ba1971c Merge "AfW custom lock screen message - API polish" into nyc-dev 2016-03-30 12:23:56 +00:00
Rubin Xu
b436591708 Add DevicePolicyManager API to install a client cert chain.
When installing a keypair the caller will have the option to specify a
certificate chain which will later be returned to whoever requests access
to the keypair via KeyChain.

Bug: 18239590
Change-Id: Id21ef026e31537db38d891cb9b712dd4fe7159c7
2016-03-30 11:57:58 +01:00
Andrii Kulian
933076d805 Refactor usages of Picture In Picture and Multi Window (1/4)
Bug: 27365860
Change-Id: I1590e430a12ceb84cb83da295e0bf7e4378fea96
2016-03-29 18:39:45 -07:00
George Mount
d0ca0e0984 Ensure window has been added in isTopOfTask
Bug 27893230

When isTopOfTask is called prior to the window being added, it
will throw an IllegalArgumentException. This checks that the
window has been added before making the call.

Change-Id: Idd14c0f1051e16d96a0a1fa9f990f380a1f69911
2016-03-29 10:35:03 -07:00
Andrei Stingaceanu
efc4a344a1 AfW - suspend apps - API polish
* renamed getPackageSuspended => isPackageSuspended
* does not return false for an error, instead throws
  NameNotFoundException if the package could not be
  found, or if there is an unknown RemoteException,
  wraps it in a RuntimeException and rethrows.

Bug: 27532430
Bug: 22776761
Change-Id: Iee00600089b1c0556a3312b10456826464fa8f9f
2016-03-29 14:49:21 +00:00
Andrei Stingaceanu
16187903b4 AfW custom lock screen message - API polish
DevicePolicyManager:
* getDeviceOwnerLockScreenInfo now returns CharSequence as it returns a string
  for display to a user
* setDeviceOwnerLockScreenInfo
** accepts CharSequence, not String as this is a string displayed to the user
** Returns void; throws an appropriate runtime exception on failure

Bug: 27531295
Change-Id: I30528569cfa66ee76f857fbee1c3196f821718fd
2016-03-29 13:04:29 +00:00
Joe Onorato
0caf007b3f Merge "Refactor ProcessStats." into nyc-dev 2016-03-28 20:52:39 +00:00