Commit Graph

59517 Commits

Author SHA1 Message Date
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
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
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
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
Mahaver Chopra
1ce53bc571 Adding DPM.reboot
Adding new policy in DPM to trigger reboot on the device.
Requirement: Device owner can reboot the device if it is stuck or is
not useable due to some unresponsive UI.

Bug: 25304994
Change-Id: I7a6d5c8ad611de9c1cf6619378e492a306b41626
2015-12-16 17:55:54 +00:00
Wale Ogunwale
2336f716c8 Merge "Only persist task bounds for freeform tasks." 2015-12-16 15:32:27 +00:00
Alan Viverette
9084d22cb9 Check for null MenuHelper before setting presenter callback
Bug: 26219569
Change-Id: Ia19a1304aa10dac52b89d0ee85acdb5671a15777
2015-12-16 09:56:37 -05:00
Esteban Talavera
c063603d9b Merge "Only system can set application restrictions via UserManager" 2015-12-16 10:44:12 +00:00
Keisuke Kuroyanagi
366a88603e Change cursor shape to STYLE_HAND on ClickableSpans
Bug: 19544351
Change-Id: Ibbee410bf22db6962b2ba2b89111c9e34fce4747
2015-12-16 15:50:37 +09:00
Jun Mukai
9dcbdcd50f Merge "Exclude accessing settings from PointerIcon." 2015-12-16 02:11:56 +00:00
Christopher Tate
ffa6a88658 Add crop hint and backup-eligible info to wallpaper API
The OS will not distinguish between the physical underlying wallpaper
image and the target displayable subrect of that image.  This will enable
more pleasing conveyance of backed-up wallpaper imagery between dissimilar
devices.  The allow-backup hint is a way for wallpaper sources to ensure
that the OS doesn't back up imagery that should not be propagated across
devices.

(NB: the backing implementation isn't in place yet; this is just to
permit forward-looking work on client apps in the interim.)

Bug 25454501
Bug 25453848

Change-Id: Id014d552ae509f659992d57b915ef95c5d4b8d1a
2015-12-15 17:43:35 -08:00
Wale Ogunwale
807d8826b1 Only persist task bounds for freeform tasks.
Bug: 26216628
Change-Id: Ibe28d7f988675086e233da371baf526eb7254fa7
2015-12-15 17:05:09 -08:00
Filip Gruszczynski
d5f94468ba Merge "API for launching activities to the side in side-by-side mode." 2015-12-16 00:52:06 +00:00
Roozbeh Pournader
f11eca8551 Merge "Negotiate locales during Resources contruction and updates" 2015-12-16 00:44:01 +00:00
Jun Mukai
e4e75daa65 Exclude accessing settings from PointerIcon.
This code structure causes a crash as rerported, better to extract
access to the settings to InputManagerService, who actually cares
about it.

Bug: 26196092
Change-Id: I4e0dbcc24ccf5d11681738ca3576b64471aa8cc4
2015-12-15 16:40:50 -08:00
Filip Gruszczynski
80e29f1cca API for launching activities to the side in side-by-side mode.
This API is intended for side-by-side mode, so that when a new activity
is launched, it will show up on the other side instead of covering the
launching activity.

Bug: 26141281

Change-Id: I97d7f2f48d42a31cfb1a86821474582b9c5d9e45
2015-12-15 16:08:44 -08:00
Adam Lesinski
72c1a0a110 Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev am: 1d6d4c5a69
am: d5808d0d35

* commit 'd5808d0d356c5c7263f1ad0982a221c7a0f1df07':
  DO NOT MERGE: Fix batterystats battery level int packing
2015-12-16 00:05:41 +00:00
Adam Lesinski
d5808d0d35 Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev
am: 1d6d4c5a69

* commit '1d6d4c5a695051ccb9b455306b155bad5d6f136a':
  DO NOT MERGE: Fix batterystats battery level int packing
2015-12-15 23:57:13 +00:00
Wale Ogunwale
fbe12c4e0f Added PackageManager#FEATURE_PICTURE_IN_PICTURE
Indicating that a device supports picture-in-picture
multi-window mode.

Also allow activities to be in Pip mode if force resizeable
is enabled.

Bug: 25580820
Bug: 26187878
Change-Id: If80edfee39ece5a51d21040e4d3a8a9135aa1783
2015-12-15 14:55:27 -08:00
Fyodor Kupolov
bdbc9692c7 Introduced PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER
When set, signals that the application is required for the system user and
should not be uninstalled.

Bug: 25616324
Change-Id: Idbbd1618e09c40bdb83fa26c0a3d9662dd73bea4
2015-12-15 14:49:42 -08:00
Alan Viverette
db08925a8f Fix build
Change-Id: I3e1708a9e41155b9b00e0365e4392ae66202fdbb
2015-12-15 17:16:33 -05:00