Commit Graph

7785 Commits

Author SHA1 Message Date
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
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
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
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
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
Alan Viverette
b02fc79930 Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev
am: f045808

* commit 'f04580852d387fae556de0250cb18d32169c2cdb':
  Clean up Dialog annotations, lint warnings, and declarations

Change-Id: Ic6de44b10c04ccd5f94e60c6be47166cf64f317e
2016-04-01 20:27:19 +00: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
Adam Lesinski
75babad207 Merge "ResourcesManager: Fix a cache issue" into nyc-dev
am: ce2a399

* commit 'ce2a3990323433a3278100531ef6e9184497d058':
  ResourcesManager: Fix a cache issue

Change-Id: I6ec0fb190687fb7a421445938f71cc20aa0bf9af
2016-04-01 19:05:10 +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
1174768d99 Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev
am: 228137f

* commit '228137fa269b7e71205174f9d0d9ce91d9a1abfc':
  Refactor DatePickerDialog constructors to avoid early callback

Change-Id: If31e64a6f0a15d60e99c8b7960f906a153a91106
2016-04-01 18:34:39 +00: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
ceeab499ac Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev
am: 032a76f

* commit '032a76f94b457d255ebc0895bc1d8f3c0b6d8e31':
  Remove unused import for KeyboardShortcutGroup

Change-Id: Id69c4c923a3456857d73a2c21a27be962378bd12
2016-04-01 16:27:01 +00:00
Clara Bayarri
032a76f94b Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev 2016-04-01 16:18:28 +00:00
Kenny Guy
5ad78dbd4c Merge "Allow PO to check if it is in a managed profile." into nyc-dev
am: fa7b672

* commit 'fa7b6723e6fae582bc4948394b06c0f88dc1baa3':
  Allow PO to check if it is in a managed profile.

Change-Id: I3ae227f65db8deb6a2dc622f91807538aa164c4c
2016-04-01 14:29:00 +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
Christopher Tate
e6dc55c327 Merge "API review: WallpaperManager" into nyc-dev
am: 9c4ec06

* commit '9c4ec06988642e24f9cf9a0dd79d777526b0a0a6':
  API review: WallpaperManager

Change-Id: If59d4cb7bc609fee139e0874dd70efc451367522
2016-03-31 19:33:49 +00:00
Chris Tate
9c4ec06988 Merge "API review: WallpaperManager" into nyc-dev 2016-03-31 19:24:42 +00:00
Robin Lee
8d0373c8fd Merge "API to approve CA certificates" into nyc-dev
am: f1fe782

* commit 'f1fe782e912d3feed9cded8fb80b179c4ee5d09c':
  API to approve CA certificates

Change-Id: Ia84876f692a79d159cbfadd5888d73557e111e37
2016-03-31 18:31:32 +00:00
Robin Lee
f1fe782e91 Merge "API to approve CA certificates" into nyc-dev 2016-03-31 18:26:32 +00:00
Joe Onorato
d1d3cfb1b6 Merge "Include process state in association tracking" into nyc-dev
am: d0f83b7

* commit 'd0f83b7bcadc6cfa4f39ee99ea96e48591fd6539':
  Include process state in association tracking

Change-Id: Ifff023a305ed76b15966ef30812961f528e9b434
2016-03-31 17:49:18 +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
4c0fc48aa7 Merge "AfW - suspend apps - API polish" into nyc-dev
am: aa60469

* commit 'aa604694450539b4c99901b0714efaa79db3c87d':
  AfW - suspend apps - API polish

Change-Id: I0bbb5d6ddc8f81d70960d179cf5f37f913ccddd8
2016-03-31 15:36:58 +00:00
Andrei Stingaceanu
aa60469445 Merge "AfW - suspend apps - API polish" into nyc-dev 2016-03-31 10:57:58 +00:00
Michal Karpinski
2d884a207b Merge "Adjusting javadocs for process logging" into nyc-dev
am: 31f59f1

* commit '31f59f1106824594ab8d5d48391b785b8687c4b0':
  Adjusting javadocs for process logging

Change-Id: Ia37bd42b2f7dffd71d08515a5d8b93771effbf57
2016-03-31 10:02:57 +00:00
Michal Karpinski
31f59f1106 Merge "Adjusting javadocs for process logging" into nyc-dev 2016-03-31 09:56:24 +00:00
Jeff Sharkey
baa9a1a5d5 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev
am: 4afe32d

* commit '4afe32d4934cc89371dce05d669e9b1bdbf14449':
  Keep COLUMN_LOCAL_URI working for now.

Change-Id: I6d89ede091d3bc6b1620abd2638d28273be5feed
2016-03-31 03:50:25 +00:00
Jeff Sharkey
4afe32d493 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev 2016-03-31 03:46:14 +00:00
Sudheer Shanka
81c6380114 Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev
am: d2a968f

* commit 'd2a968f9c31ba1864bc514bb88a9a939508fe794':
  Return null value if getActiveAdminUncheckedLocked returns null.

Change-Id: I2767b95af01a0ef78bf1c216579b81ee705e1468
2016-03-31 02:17:16 +00:00
Andrii Kulian
b6ba05ffb0 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev
am: ac94586

* commit 'ac945867145c571506a211ccb0a87a3402c4d745':
  Refactor usages of Picture In Picture and Multi Window (1/4)

Change-Id: I34a274c3eca15546d7be85fbb30ac072ff03db7f
2016-03-31 02:17:08 +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