228370 Commits

Author SHA1 Message Date
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
Calin Juravle
f19c9638dd Pass app's code paths to the runtime
The runtime needs the application's main code paths so it know for which
dex files to record the profile.

Bug:26080105
Change-Id: I5f2cb5c140aa6893ac78bc0d5897e33764569e5b
2015-12-17 12:38:27 +02: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
fbca8264e0 Merge "TextView tests: open context menu on right click." 2015-12-17 08:51:35 +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
Keisuke Kuroyanagi
a0b3c06881 TextView tests: open context menu on right click.
- Extend MouseUiController and MouseClickAction to support choosing click
button.
- Introduce ContextMenuUtils to provide useful methods for context menu
testing.

Bug: 25730231
Change-Id: I4f04716428b8cfdcf9f953fe8f8d27f5374b0425
2015-12-17 08:19:56 +00:00
Tomasz Mikolajewski
416b8ea732 Merge "Add support to virtual and typed files in StubProvider." 2015-12-17 08:05:36 +00:00
Tomasz Mikolajewski
f65fdebddb Add tests for copying virtual typed files.
Bug: 26147488
Change-Id: I44cfae518f4b6dfceed5b9f50b132e2acf161b3f
2015-12-17 17:02:42 +09:00
Wonsik Kim
c2d26a0835 Merge "TIF: add signal detection feature for HW inputs" 2015-12-17 07:05:51 +00:00
Wonsik Kim
102d0b7b69 TIF: add signal detection feature for HW inputs
Bug: 23820259
Change-Id: If7f03b49f7510ec405dfc4fb2b6f709b8c8b820d
2015-12-17 15:18:39 +09:00
Tomasz Mikolajewski
cca31ebb0e Add support to virtual and typed files in StubProvider.
Bug: 26147488
Change-Id: I40a75547ff16bb7d45f36843c29692268b4291b6
2015-12-17 15:06:29 +09:00
Tomasz Mikolajewski
a416cd02b6 Merge "Append a correct extension in case of copying virtual files." 2015-12-17 06:03:44 +00: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
Hung-ying Tyan
bdc9d58d06 Allow library spec and app configs to be read from odm partition
Currently only feature specs are allowed to be read from /oem/etc/permissions.
ODM may want to add their own library specs and app configs (ie, "app-link",
"system-user-whitelisted-app" and "system-user-blacklisted-app") but they can
only add them to /system/etc/permissions and thus polluted the system.img.
With the fine-grained permission flag introduced in this change, we also tighten
the permission for OEMs so they can only customize the feature specs.

Bug: 25759900
Change-Id: I44ef1380b160c2b6a53f2af6de0c5f5eae27a859
2015-12-17 11:14:40 +08:00
Shreyas Basarge
0bc4c58ffc Merge "Fixes NPE bug in JobScheduler.getAllPendingJobs()" 2015-12-17 03:00:00 +00:00
Tomasz Mikolajewski
5fc0240bf5 Append a correct extension in case of copying virtual files.
Bug: 26147488
Change-Id: I3e310c102e7c819ea16b47dfe7902d389cfc9d00
2015-12-17 11:27:24 +09:00
Tomasz Mikolajewski
bf0bbc8742 Merge "Fix CopyService after recent refactoring." 2015-12-17 02:04:22 +00:00
Tomasz Mikolajewski
f03ba80ebf Fix CopyService after recent refactoring.
My recent CL broke tests badly. This time double checked.

Bug: 26218041
Bug: 26176231
Change-Id: Ia1f68d7cff83ec9c3cfb9bccb9c91ff092b25ced
2015-12-17 11:03:10 +09: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
Adam Lesinski
65f8e2a91f DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f am: 7f5ad22330 am: 1f7a36b8e6
am: 087e0fcba6  -s ours

* commit '087e0fcba687bce677f39fd2b708a9cbb1defcd0':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-17 00:40:32 +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
Filip Gruszczynski
6363e18180 Merge "If pinned stack is focused, look for the one below for logging." 2015-12-17 00:11:28 +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
Tyler Gunn
e502924ed3 Merge "Remove dependency on android.telecom.Call in VideoCallImpl for testing." 2015-12-17 00:09:55 +00:00
Chris Craik
e60a52a236 Fix build
Change-Id: I1fc72636afc070257526ce1500e96e9b39089640
2015-12-16 16:05:49 -08:00
Bryce Lee
cae2f2415b Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev 2015-12-17 00:02:41 +00:00
Chris Craik
031eaedef8 Merge "Add TextureView support to new renderer/reorderer" 2015-12-16 23:48:27 +00:00
Adam Lesinski
087e0fcba6 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f am: 7f5ad22330
am: 1f7a36b8e6

* commit '1f7a36b8e6aa55dcb22a63c250fb318260ac349f':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-16 23:44:25 +00:00
Matt Sarett
d31512b9a6 Clean-ups for BitmapRegionDecoder
Check for OOM after calling encodedFormatToString().

Do not correct Alpha8 to Gray8.  This will be handled in Skia.

Change-Id: Id573548608fbd5fbeef2898844480d8f8f73e1d0
2015-12-16 18:40:44 -05:00
Chris Craik
d2dfd8f128 Add TextureView support to new renderer/reorderer
bug:22480459

Change-Id: I2e4c0bc6b904706132f3f5087ededc9cac9b40fb
2015-12-16 15:35:40 -08:00
Adam Lesinski
1f7a36b8e6 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f
am: 7f5ad22330

* commit '7f5ad223306a482bdf33d213971af041e9fba590':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-16 23:35:17 +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
Adam Lesinski
7f5ad22330 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2
am: 8c9209183f

* commit '8c9209183fa67953bebe1adb5dfb529c1b6273f0':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-16 23:25:45 +00: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
Adam Lesinski
8c9209183f DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638
am: 40d1ab91d2

* commit '40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-16 23:16:18 +00:00
Wale Ogunwale
ca9c0d428a Merge "Added config_defaultPictureInPictureBounds" 2015-12-16 23:16:03 +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