Commit Graph

59537 Commits

Author SHA1 Message Date
Gustav Sennton
081dcb82ff Merge "Allow several valid signatures per WebView provider." 2015-12-17 18:04:38 +00:00
Filip Gruszczynski
233c1c57c1 Merge "Only add noDisplay activities to freeform source tasks." 2015-12-17 17:57:49 +00:00
Filip Gruszczynski
3d0267143f Only add noDisplay activities to freeform source tasks.
We started adding noDisplay activities to source tasks to make the
resolver activity show up within the same task bounds as what caused it
to appear. However, in other cases it might cause to add a noDisplay
activity to a task in which we don't expect anything to appear, e.g.
home task when launching from home.

Bug: 26128908
Bug: 26023670
Change-Id: I2f64e82b3c3754cdbcb4cac3f907674344e67e04
2015-12-17 09:56:45 -08:00
Samuel Tan
a6d4744e89 Merge "Add comments to keep Java and native binder PersistableBundle in sync" am: 6de926a7d6
am: 4981ae9083

* commit '4981ae908349767fee7976cc82c54a7fb00ee4fd':
  Add comments to keep Java and native binder PersistableBundle in sync
2015-12-17 09:55:24 -08:00
Samuel Tan
76d3072dd6 Merge "Fix PersistableBundle handling in Parcel.writeValue" am: d12959193c
am: d3decff052

* commit 'd3decff052c4f7471a21fbbb116b32586181b391':
  Fix PersistableBundle handling in Parcel.writeValue
2015-12-17 09:53:44 -08:00
Samuel Tan
19091a7fad Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-12-17 09:52:47 -08:00
Samuel Tan
33d5888d7a Merge "Specify path for native PersistableBundle implementation" am: 477fa220b1
am: 0bc7647f63

* commit '0bc7647f63bcdf2d63ee71d770f9514a239eaba8':
  Specify path for native PersistableBundle implementation
2015-12-17 09:52:11 -08:00
Alan Viverette
0cc6b5a496 Merge "Propagate TextView drawable state after resolving RTL drawables" 2015-12-17 17:51:53 +00:00
Gustav Sennton
5c2454cde1 Allow several valid signatures per WebView provider.
If one of the signatures match the package signature the package is
considered valid. This makes it possible to match signatures in user
builds for both signed and unsigned builds.

Bug: 26220882

Change-Id: Ie2e7567bf518d4859d68b5fdf5b9833fcdaa7670
2015-12-17 17:10:01 +00:00
Filip Gruszczynski
92e432c30e Refactor and improve window layering.
This CL moves layer calculation into a separate class, so the whole
logic can be encapsulated. It also extracts special cases from the
general loop and instead applies them at the end. This simplifies the
logic in the main algorithm and makes it clearer what needs to happen
for special cases.

Bug: 26144888

Change-Id: I87347bf0198bd0d3cd09e4231b4652ab979f2456
2015-12-17 08:55:50 -08:00
Alan Viverette
ad217b68f8 Merge "Don't call public non-final getResources() from getAssets()" 2015-12-17 16:38:42 +00:00
Esteban Talavera
f3378a29e9 Merge "Device or profile owner can let another app manage app restrictions" 2015-12-17 10:59:16 +00:00
Mahaver Chopra
699d537d1b Merge "Adding DPM.reboot" 2015-12-17 10:59:01 +00:00
Esteban Talavera
bf60f728cc Device or profile owner can let another app manage app restrictions
The device or profile owner can allow another
package to set app restrictions for any app in that user

Similar to the way it can give permission to access
CA certificate related APIs from M.

Bug: 22541936
Change-Id: I0c1b0804ad300dfa4fbdc1c7721c5d8653d77861
2015-12-17 10:57:09 +00:00
Chris Banes
12a47ac41e Fix AlertDialog.setIcon() not working when called after show() pt.2
BUG: 26183328
Change-Id: I2bd8ff0315e04dd33fe720f0e5c32dec06747afc
2015-12-17 10:00:26 +00:00
Keisuke Kuroyanagi
d056081e50 TextView: Open context menu on right click.
- Construct context menu in #onCreateContextMenu.
- Ignore non-primary buttons for selection.
- Don't open context menu on long click.

Bug: 19544351
Bug: 19397276
Bug: 24872170

Change-Id: I4690e1485682be4f9b504b8fb6af936b979f13b8
2015-12-17 17:50:42 +09:00
Vladislav Kaznacheev
d9ab9b1889 Merge "Rename and simplify DropPermissionHolder" 2015-12-17 04:07:39 +00:00
Keisuke Kuroyanagi
b5703105de Merge "Change cursor shape to STYLE_HAND on ClickableSpans" 2015-12-17 04:05:49 +00:00
Vladislav Kaznacheev
9149d2b117 Rename and simplify DropPermissionHolder
Rename DropPermissionHolder to DropPermissions and move
all server-side implementation details into a separate class.
Rename DragEvent.getDropPermissionHolder to
requestDropPermissions and make it take the permissions
implicitly.

Change-Id: Ia83f7cb8af07ce13ba9536d24b0f9d63331d8736
2015-12-16 17:10:36 -08:00
Samuel Tan
4981ae9083 Merge "Add comments to keep Java and native binder PersistableBundle in sync"
am: 6de926a7d6

* commit '6de926a7d6439745cd0f01a69a5dd75b006b923d':
  Add comments to keep Java and native binder PersistableBundle in sync
2015-12-17 00:54:03 +00:00
Samuel Tan
d3decff052 Merge "Fix PersistableBundle handling in Parcel.writeValue"
am: d12959193c

* commit 'd12959193c60254b6b03b2a60a9c6e598e9da2e5':
  Fix PersistableBundle handling in Parcel.writeValue
2015-12-17 00:50:53 +00:00
Samuel Tan
0bc7647f63 Merge "Specify path for native PersistableBundle implementation"
am: 477fa220b1

* commit '477fa220b1766a3822171fa514983198e09daabb':
  Specify path for native PersistableBundle implementation
2015-12-17 00:49:19 +00:00
Bryce Lee
3a0ea6254d Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b am: fc3762aafd am: 0ccc3a1cb5
am: 972c616ce2

* commit '972c616ce2f83622e5529ef86c9d7f243a60b601':
  Add UUID to BluetoothHeadsetClientCall
2015-12-17 00:42:08 +00:00
Eino-Ville Talvala
3282f864f8 Merge "Revert "Camera2: create new streams if surface size has changed"" am: 79ac3edc57
am: 6e49caeaab

* commit '6e49caeaabeb852f0b6cd1e75d9871bc6b70b981':
  Revert "Camera2: create new streams if surface size has changed"
2015-12-17 00:39:07 +00:00
Eino-Ville Talvala
fefcb9bae2 Merge "Camera2: create new streams if surface size has changed" am: bcb636d423
am: c8a16ab564

* commit 'c8a16ab564532cbbdd781d0528c825945c63e907':
  Camera2: create new streams if surface size has changed
2015-12-17 00:37:41 +00:00
Samuel Tan
6de926a7d6 Merge "Add comments to keep Java and native binder PersistableBundle in sync" 2015-12-17 00:35:58 +00:00
Samuel Tan
d12959193c Merge "Fix PersistableBundle handling in Parcel.writeValue" 2015-12-17 00:35:43 +00:00
Samuel Tan
477fa220b1 Merge "Specify path for native PersistableBundle implementation" 2015-12-17 00:35:35 +00:00
Bryce Lee
972c616ce2 Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b am: fc3762aafd
am: 0ccc3a1cb5

* commit '0ccc3a1cb5487fb2640d749be698866475a2c435':
  Add UUID to BluetoothHeadsetClientCall
2015-12-17 00:28:04 +00:00
Bryce Lee
0ccc3a1cb5 Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b
am: fc3762aafd

* commit 'fc3762aafd58ff9eada0b5ed261de20a40d7b07a':
  Add UUID to BluetoothHeadsetClientCall
2015-12-17 00:20:34 +00:00
Bryce Lee
fc3762aafd Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
am: cae2f2415b

* commit 'cae2f2415ba04eb854fdcdc6aa66c857ad7148d0':
  Add UUID to BluetoothHeadsetClientCall
2015-12-17 00:09:56 +00:00
Bryce Lee
e457fa4b9d Add UUID to BluetoothHeadsetClientCall
This will allow for unique identification of a call as id only provides
uniqueness per session.

Bug: 26016489
Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
2015-12-16 15:33:59 -08:00
Eino-Ville Talvala
6e49caeaab Merge "Revert "Camera2: create new streams if surface size has changed""
am: 79ac3edc57

* commit '79ac3edc57f93d6b8e8187b549dd23512b841fb2':
  Revert "Camera2: create new streams if surface size has changed"
2015-12-16 23:20:29 +00:00
Eino-Ville Talvala
c8a16ab564 Merge "Camera2: create new streams if surface size has changed"
am: bcb636d423

* commit 'bcb636d4232bedfb421ecaa157f67b96a1b26944':
  Camera2: create new streams if surface size has changed
2015-12-16 23:09:29 +00:00
Fyodor Kupolov
6142f90b9f Merge "Introduced PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER" 2015-12-16 23:07:20 +00:00
Eino-Ville Talvala
79ac3edc57 Merge "Revert "Camera2: create new streams if surface size has changed"" 2015-12-16 23:01:43 +00:00
Yin-Chia Yeh
e94b3fe953 Revert "Camera2: create new streams if surface size has changed"
This change is redundant after the following change is merged:

Camera2: Handle surface size change

When comparing if two OutputConfigurations are equal, also check
the width, height, format, dataspace when the output configurations
were created. With this, CameraDeviceImpl knows that the surface has
changed sizes and will reconfigure the stream.

Bug: 12250682
Change-Id: I4216260a0a08ad87b835ed97e9eaddf1df317fcc
This reverts commit f49f8b0bad.
2015-12-16 22:50:48 +00:00
Makoto Onuki
60df01c522 Merge "Add SQLiteDatabase.validateSql()" 2015-12-16 22:31:44 +00:00
Makoto Onuki
17aa1b7ac7 Add SQLiteDatabase.validateSql()
This API checks the SQL syntax by compiling it.  This is useful to
detect SQL injection, for example.

Change-Id: I956548a34f664950246856966e5601dcac3daf00
2015-12-16 14:18:28 -08:00
Eino-Ville Talvala
bcb636d423 Merge "Camera2: create new streams if surface size has changed" 2015-12-16 22:18:13 +00:00
Wale Ogunwale
c51fd1d8cf Merge "API for an Activity to enter picture-in-picture mode." 2015-12-16 21:30:51 +00:00
Alan Viverette
189d4f5b77 Propagate TextView drawable state after resolving RTL drawables
Bug: 24502082
Change-Id: Iec9c44041622d19401fc074947e15b4843f79d86
2015-12-16 16:06:23 -05:00
Alan Viverette
713a5cdb53 Don't call public non-final getResources() from getAssets()
Refactors to getResourcesInternal() and calls that from both methods.
Adds documentation on Context.getResources() and getAssets() that the
instances returned should be consistent with each other.

Bug: 26228895
Change-Id: I41b09f1e9a3a0315bcdf1c08a7b431a9a697bb6f
2015-12-16 15:46:32 -05:00
John Reck
fc5151106f Merge "resolve merge conflicts of 04ce46db64 to master." 2015-12-16 19:09:12 +00:00
John Reck
bf4b31f7b2 resolve merge conflicts of 04ce46db64 to master.
Change-Id: I935bb47718f0e7d5fb48945dd8de6e28dac136e5
2015-12-16 11:07:53 -08:00
Wale Ogunwale
9c604c7c1d API for an Activity to enter picture-in-picture mode.
Bug: 25580820
Change-Id: I5c1bf17dd5dd92622458a61517bc9941e4ee5277
2015-12-16 11:01:46 -08:00
Alan Viverette
0550f1b804 Merge "Check for null MenuHelper before setting presenter callback" 2015-12-16 18:56:08 +00:00
John Reck
04ce46db64 Merge "libhwui: make setSurface asynchronous"
am: 738a5d4f18

* commit '738a5d4f18e69c03700b77af0ea7e2a101da2c34':
  libhwui: make setSurface asynchronous
2015-12-16 18:44:57 +00:00
John Reck
738a5d4f18 Merge "libhwui: make setSurface asynchronous" 2015-12-16 18:27:24 +00:00
Andrei Stingaceanu
1e2839188f Wire call to suspend a package
Adds APIs in DevicePolicyManager and PackageManager for allowing
a device admin to suspend a package. PackageManagerService sets
or unsets a new PackageUserState 'suspended' setting. Terminal
command to suspend/unsuspend has been added via
PackageManagerShellCommand (as root).

Next steps:
* use the new 'suspended' setting for denying access to start app
(probably in ActivityStackSupervisor)
* broadcast a PACKAGE_(UN)SUSPENDED intent for launchers to pick up
* remove app from recents (go further and kill it if it is running)
* erase existing notifications for this app

Bug: 22776576
Change-Id: I718b3498f6a53cc0c6fdfb6d15031e53ddca4353
2015-12-16 18:14:14 +00:00