Commit Graph

7740 Commits

Author SHA1 Message Date
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
Lorenzo Colitti
882f62dd1a Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev
am: 7d4ed2f

* commit '7d4ed2f5aba19a6b1efb7dc0772f7debfa8a7299':
  Avoid null app context in StaticApplicationContextServiceFetcher.

Change-Id: I86ee864b37109cac50dacbd34685c9c000fb763b
2016-03-30 23:09:25 +00:00
Lorenzo Colitti
7d4ed2f5ab Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev 2016-03-30 23:03:18 +00:00
Adam Lesinski
7baa5212c2 Merge "Allow multiple Resources associated with an Activity" into nyc-dev
am: d17f96a

* commit 'd17f96ae007179007765c0f75b6bffb13c9285cb':
  Allow multiple Resources associated with an Activity

Change-Id: I34dd24af289d3384deb72cf66ba076b2f7cfd2e8
2016-03-30 22:37:35 +00: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
Seigo Nonaka
0ab71b606d Merge "Fix incorrect initial locale negotiation." into nyc-dev
am: 48d8a39

* commit '48d8a39b7114565838f0db7c7b5ef4bea0819cae':
  Fix incorrect initial locale negotiation.

Change-Id: I8363dbd7df5e79c09a3f0bc0bb3ad00165e302b6
2016-03-30 19:54:21 +00:00
Roozbeh Pournader
48d8a39b71 Merge "Fix incorrect initial locale negotiation." into nyc-dev 2016-03-30 19:44:25 +00:00
Rubin Xu
4b86800055 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev
am: 5b7ca24

* commit '5b7ca24f14ae4d1189ca7683fdad1ec0e62b88b8':
  Add DevicePolicyManager API to install a client cert chain.

Change-Id: I499344fa3ae5d978bec6a4f8498f1ca037bd4505
2016-03-30 17:57:50 +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
3fcd1e74f4 Merge "Change default work challenge background color" into nyc-dev
am: 30fb053

* commit '30fb0534492478a3f95f6953b31bbb666ced8fe5':
  Change default work challenge background color

Change-Id: Ib9b90a9d84c0502d37fc5b53ef4c83e830a8a822
2016-03-30 16:24:03 +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
Andrei Stingaceanu
f46e776b06 Merge "AfW custom lock screen message - API polish" into nyc-dev
am: b70ba19

* commit 'b70ba1971c29db87e405434161489e2450309050':
  AfW custom lock screen message - API polish

Change-Id: Id2ce5fced3d6b39ab2948cb6ab7ee5001fa534cf
2016-03-30 12:35:38 +00: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
5659056da7 Merge "Ensure window has been added in isTopOfTask" into nyc-dev
am: e6ef0f9

* commit 'e6ef0f9d77efdd5852ac2e3d768280dc3571dcf7':
  Ensure window has been added in isTopOfTask

Change-Id: I16c17d62a344f4fcf71b817ab2228b13261aae7e
2016-03-29 20:07:21 +00: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
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
ee93672b78 Merge "Refactor ProcessStats." into nyc-dev
am: 0caf007

* commit '0caf007b3f0b4cd21be285820c270c51a8e502b7':
  Refactor ProcessStats.
2016-03-28 21:06:08 +00:00
Wale Ogunwale
ff064a4679 Merge "Show non-top tasks in the docked stack in recents." into nyc-dev
am: ddfc6f7

* commit 'ddfc6f7dc9e2b2a5b5c2cab033bf894c5cf1a59b':
  Show non-top tasks in the docked stack in recents.
2016-03-28 21:06:04 +00:00
Joe Onorato
0caf007b3f Merge "Refactor ProcessStats." into nyc-dev 2016-03-28 20:52:39 +00:00
Wale Ogunwale
ddfc6f7dc9 Merge "Show non-top tasks in the docked stack in recents." into nyc-dev 2016-03-28 20:22:35 +00:00
Wale Ogunwale
64ae08aa16 Show non-top tasks in the docked stack in recents.
Allows the user to access the task through recents since
it isn't currently visible on screen.

Also, changed recents to launch task currently in the docked
stack in the fullscreen stack when selected from recents list.

Bug: 27864383
Change-Id: I58549023920d064a30b6355367c3193ce3207bbd
2016-03-28 12:06:44 -07:00
George Mount
e4f870a14e Merge "If resume occurs, force finish of exiting activity." into nyc-dev
am: fe77fdf

* commit 'fe77fdf8b35d6893e7d96c9b8eeb77c4eb16980a':
  If resume occurs, force finish of exiting activity.
2016-03-28 17:25:35 +00:00
George Mount
b031fef2ec Merge "Disable suppressLayout in Visibility Activity Transitoins." into nyc-dev
am: 20d51f5

* commit '20d51f550f1e134feb74dc7c23aa5f29f7062685':
  Disable suppressLayout in Visibility Activity Transitoins.
2016-03-28 17:25:33 +00:00
George Mount
fe77fdf8b3 Merge "If resume occurs, force finish of exiting activity." into nyc-dev 2016-03-28 17:21:11 +00:00
George Mount
20d51f550f Merge "Disable suppressLayout in Visibility Activity Transitoins." into nyc-dev 2016-03-28 17:20:53 +00:00
John Reck
8de1bcd896 Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-dev-plus-aosp 2016-03-28 16:17:10 +00:00
Lorenzo Colitti
0ad9ab07fa Avoid null app context in StaticApplicationContextServiceFetcher.
StaticApplicationContextServiceFetcher passes the application
context to the services it creates, but sometimes the application
context can be null. Cases we've seen so far are:

- Apps that (incorrectly) call getSystemService in
  attachBaseContext. In this case the passed-in context is what
  will become the application context soon afterwards.
- ActivityThread$ApplicationThread.setHttpProxy. In this case the
  passed-in context is the system context.

In both of these cases the passed-in context is never freed, so
passing it in to the service will not result in a leak.

Bug: 27532714
Bug: 27502146
Bug: 27337770
Change-Id: I5971c67b0e699d1a77850be8a338a448a96ec7d7
2016-03-28 17:33:30 +09:00
Jeff Sharkey
bef5aad065 Update PRE_BOOT_COMPLETED for FBE.
am: bd91e2f

* commit 'bd91e2f3f6aca512a02be645b2515b5e3331e177':
  Update PRE_BOOT_COMPLETED for FBE.
2016-03-27 17:47:15 +00:00
Jeff Sharkey
bd91e2f3f6 Update PRE_BOOT_COMPLETED for FBE.
Now that CE data isn't available until after a user is unlocked, we
need to delay the PRE_BOOT_COMPLETED broadcasts.  This is done by
adding a new RUNNING_UNLOCKING user state to the UserController
lifecycle.

We now track the last fingerprint a user was logged in under, and we
dispatch PRE_BOOT receivers when that fingerprint changes.  To work
around battery pull issues, we only persist the updated fingerprint
once all PRE_BOOT receivers have finished.  This is less granular
than the original solution, but it's still correct.  We only consider
a user as "logged in" once it transitions into the RUNNING_UNLOCKED
state.

When starting a process, track if the user was "unlocked" when
started, so that we only spin up unaware providers in processes
started before user unlock.

Add generic IProgressListener to communicate PRE_BOOT progress and
strings up to lock screen.  For now, LockSettingsService just blocks
until finished, but it could display these strings in the future.

Bug: 27220885
Change-Id: I349439776b885acd32f6a578d8951ffd95640be2
2016-03-27 10:56:48 -06:00
Jorim Jaggi
ea42b59a06 Merge changes from topic \'recents_transition\' into nyc-dev
am: a04c532

* commit 'a04c532a09b8d946ebc9a086f673220059218869':
  Implement transition for docking task in recents #6
  Implement transition for docking task in recents #5
  Implement transition for docking task in recents #4
  Implement transition for docking task in recents #3
  Implement transition for docking task in recents #2
  Implement transition for docking task in recents #1
  Show a scrim activity if task is not resizable
2016-03-25 22:32:27 +00:00
Edward Cunningham
0ac521ed8c Merge "DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""" into nyc-dev
am: d0ee17d

* commit 'd0ee17d926cce445bcd22b15e80e725aa4639895':
  DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""
2016-03-25 22:32:25 +00:00
Jorim Jaggi
a04c532a09 Merge changes from topic 'recents_transition' into nyc-dev
* changes:
  Implement transition for docking task in recents #6
  Implement transition for docking task in recents #5
  Implement transition for docking task in recents #4
  Implement transition for docking task in recents #3
  Implement transition for docking task in recents #2
  Implement transition for docking task in recents #1
  Show a scrim activity if task is not resizable
2016-03-25 22:22:05 +00:00
Edward Cunningham
d0ee17d926 Merge "DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""" into nyc-dev 2016-03-25 22:01:07 +00:00
Jorim Jaggi
192086eb8a Implement transition for docking task in recents #1
- When the docking transition is happening, defer updating
the bounds of the home stack until the transition is done.
This is to preserve the scrim which is drawn in the recents
activity.
- Use the PROLONG_AT_START infrastructure to hide the task
in recents when starting the app transition.
- When recents finally get resized at the end of the transition,
reset it's draw state so we don't move the old surface around,
and the new surface gets drawn at the new position, to avoid
flickering.
- Remove hack around not layouting docked divider if it's not
visible, it's not needed anymore and resulted in a wrong
initial position.
- Fix animation selection for docked stack divider.
- Make sure win.moved() always gets called.

Bug: 27607141
Change-Id: I76c35f09461f044a90e2c88335008284b5839cc0
2016-03-25 14:27:58 -07:00
Jorim Jaggi
2adba07d75 Show a scrim activity if task is not resizable
Add a callback to TaskStackChangeListener which gets fired when the system
might need to inform the user that a specific app might not work in
multi-window.

Use that callback in SysUI to show a translucent activity which scrims the
activity behind to inform that it might not be resizable.

Debounce the information to once per multi-window session, to not make it
annoying.

Introduce launchTaskId to start an activity in an existing task, and protect
that with START_TASKS_FROM_RECENTS permission.

Bug: 27327287
Bug: 27431869
Change-Id: I89e8d653872ab01ba3c1e252b426e5481da0e6ca
2016-03-25 14:23:41 -07:00
Edward Cunningham
abb2c5af8e DO NOT MERGE Revert "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.""
This reverts commit c6f5738d3c.

Change-Id: Ibb330f44c3910b3fc124ee8c718a508cdf3b32b4
2016-03-25 20:56:31 +00:00
Winson
fccc7349aa Merge "Dont scale task thumbnails." into nyc-dev
am: 941a1f8

* commit '941a1f81b0f50ff219a38476ffdba062b81d2fc4':
  Don’t scale task thumbnails.
2016-03-25 03:56:48 +00:00
Winson Chung
941a1f81b0 Merge "Don’t scale task thumbnails." into nyc-dev 2016-03-25 03:51:09 +00:00
Winson
217009356e Don’t scale task thumbnails.
- Changing task view thumbnail layout.  In portrait, scale the thumbnail
  to width for portrait screenshots, and apply the same scale to 
  landscape screenshots.  In landscape, scale screenshots up to 1:1, and
  tweak the app transition to clip the sides instead of scaling.
  In both orientations, fill with the background color in the remaining
  space.
- Moving some resources related to the title bar to be calculated 
  programmatically so that we can have different header bar sizes which 
  completely overlap the action bar in the screenshot in each 
  orientation.
- Constraining the task stack width in landscape to portrait

Bug: 27504677
Change-Id: Ic9b6fdde6dd728d9f2d20a8b89c05b3a350edfbf
2016-03-24 20:03:02 -07:00