OSDN Git Service
Tomasz Mikolajewski [Fri, 18 Dec 2015 02:29:48 +0000 (11:29 +0900)]
Cleanup StubProvider a little.
Change-Id: I1d9f1c978850f466ff204bff97a152ba7919a096
Adrian Roos [Fri, 18 Dec 2015 00:03:59 +0000 (00:03 +0000)]
Merge "Fix NPE in processForRemoteInput"
Chris Craik [Thu, 17 Dec 2015 20:58:24 +0000 (12:58 -0800)]
Simplify ClipArea to prefer Rect args
Change-Id: I8af83d01dc5dd8009a0cd235dd8b59dab61d8560
Chris Craik [Thu, 17 Dec 2015 23:31:30 +0000 (23:31 +0000)]
Merge "Correct drawLines annotations"
Chris Craik [Thu, 17 Dec 2015 23:11:24 +0000 (15:11 -0800)]
Correct drawLines annotations
Change-Id: I161e419a3ce427e10d802ba692679ad671e23dde
Jeff Sharkey [Thu, 17 Dec 2015 23:04:54 +0000 (23:04 +0000)]
Merge "Send LOCKED_BOOT_COMPLETED to background apps."
Jeff Sharkey [Thu, 17 Dec 2015 23:04:18 +0000 (23:04 +0000)]
Merge "Make printing framework encryption-aware."
Robert Greenwalt [Thu, 17 Dec 2015 22:52:57 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId."
Jeff Sharkey [Thu, 17 Dec 2015 22:38:20 +0000 (15:38 -0700)]
Send LOCKED_BOOT_COMPLETED to background apps.
This mirrors how we're treating the normal BOOT_COMPLETED broadcast.
Bug:
26151835
Change-Id: Ibe1df0df8b89aafbe9af073e14fdd428710a6a40
Winson Chung [Thu, 17 Dec 2015 22:33:54 +0000 (22:33 +0000)]
Merge changes Iac20cc7b,I87ce6320
* changes:
Fixing potential issue with wrong task descriptions being loaded.
Refactoring to AnimatedEvent.
Winson Chung [Thu, 17 Dec 2015 17:09:02 +0000 (12:09 -0500)]
Fixing potential issue with wrong task descriptions being loaded.
- Also cleaning up the Task to remove some confusing nomenclature
related to task properties. Now there is a single icon and title,
and we keep a copy of the TaskDescription for future icon loading.
- Also changing a few cases where we should be calling isFreeformTask()
Bug:
26221779
Change-Id: Iac20cc7b4912f76c14232a323981ab2e8f62628a
Michael Wright [Thu, 17 Dec 2015 22:27:35 +0000 (22:27 +0000)]
Merge "Start at the end of the IME dialog list, not one past."
Michael Wright [Thu, 17 Dec 2015 22:19:46 +0000 (17:19 -0500)]
Start at the end of the IME dialog list, not one past.
Bug:
26240994
Change-Id: Ibc20474930d8c796edb3a5d4b75571a045f0a8dd
Adrian Roos [Thu, 17 Dec 2015 00:47:02 +0000 (16:47 -0800)]
Fix NPE in processForRemoteInput
Bug:
26168336
Change-Id: I010fb22caee2edd85cc0263abeb729e6b952ed01
Jeff Sharkey [Thu, 17 Dec 2015 22:12:22 +0000 (15:12 -0700)]
Make printing framework encryption-aware.
Only create UserState objects when a user has been unlocked, meaning
we can connect to the spooler. Ignore package events that occur
while a user is locked, since we'll kick off updateIfNeededLocked()
when that user is eventually unlocked.
In all other cases, throw if someone tries obtaining UserState for
a still-locked user. This should help catch any edge cases in the
system, and communicate clearly through public APIs that printing
isn't available until the user is unlocked.
Bug:
26246836
Change-Id: If15744621890baee206d355484fe20933afc65d8
Julia Reynolds [Thu, 17 Dec 2015 22:12:04 +0000 (22:12 +0000)]
Merge "Allow users to set app-wide Importance default"
Filip Gruszczynski [Thu, 17 Dec 2015 21:54:00 +0000 (21:54 +0000)]
Merge "Use correct SparseArray access method when iterating over it."
Julia Reynolds [Thu, 17 Dec 2015 13:32:48 +0000 (08:32 -0500)]
Allow users to set app-wide Importance default
And the associated ui changes to the notification guts.
Bug:
22451710
Change-Id: I4e0b11e7b24d70b039a432c5e6cd76c9c7cc547c
Jason Monk [Thu, 17 Dec 2015 21:43:07 +0000 (16:43 -0500)]
Small fixes in TileService
Change-Id: I4d10c43d8e40697d144802067fcd4f95d866e4e0
Jeff Sharkey [Thu, 17 Dec 2015 21:28:06 +0000 (21:28 +0000)]
Merge "Make AppWidgets encryption-aware."
Chris Craik [Thu, 17 Dec 2015 21:24:51 +0000 (21:24 +0000)]
Merge "Add temporary switch for new renderer in JNI"
Jeff Sharkey [Thu, 17 Dec 2015 18:19:00 +0000 (11:19 -0700)]
Make AppWidgets encryption-aware.
Only parse and load AppWidget configuration details after a user has
been unlocked. Yell loudly if someone accidentally tries loading
data for a locked user.
Tidy up protected broadcast logic a bit more to handle persistent
processes. Add backwards compatible behavior for APPWIDGET_UPDATE
broadcast simliar to APPWIDGET_CONFIGURE, since some apps are sending
it to themselves.
Add hidden USER_HANDLE extra to a handful of broadcasts to make
logic more consistent.
Bug:
26247049,
26219971
Change-Id: I54e4f2e343488571f9baa1a316962f41186c1a2c
Chris Craik [Wed, 16 Dec 2015 23:57:21 +0000 (15:57 -0800)]
Add temporary switch for new renderer in JNI
bug:
22480459
Change-Id: I6cb19332cb09650f20b1cc2da3473a2618a50b1e
Alan Viverette [Thu, 17 Dec 2015 21:18:25 +0000 (21:18 +0000)]
Merge "Clamp action bar button height to default minimum height"
Filip Gruszczynski [Thu, 17 Dec 2015 21:05:11 +0000 (13:05 -0800)]
Use correct SparseArray access method when iterating over it.
The current code works with a single display, because that display will
have id 0, so the old code will work (get(0) will return that display).
Bug:
26089885
Change-Id: If685c0ff006f353e6d56fd144acbce4d7f1e835b
Alan Viverette [Thu, 17 Dec 2015 20:59:30 +0000 (15:59 -0500)]
Clamp action bar button height to default minimum height
Previously, the fixed size of 56dp would bump the landscape action bar
measured height up to 56dp but leave the minHeight at 48dp, which would
cause the buttons to be aligned incorrectly. Now the buttons are scaled
to fit the action bar.
Change-Id: I47801d1fb072d8801b7bbae5c42be3bdfb819404
Wale Ogunwale [Thu, 17 Dec 2015 19:54:40 +0000 (19:54 +0000)]
Merge "Use accessor methods to get/set visibleBehindActivity"
Julia Reynolds [Thu, 17 Dec 2015 19:15:30 +0000 (19:15 +0000)]
Merge "Aidl it all!"
Alan Viverette [Thu, 17 Dec 2015 19:07:29 +0000 (19:07 +0000)]
Merge "Handle null result from getVirtualChildAt()"
Todd Kennedy [Thu, 17 Dec 2015 18:49:08 +0000 (18:49 +0000)]
Merge "revert quick install"
Todd Kennedy [Wed, 16 Dec 2015 22:45:14 +0000 (14:45 -0800)]
revert quick install
bug:
25118622
Change-Id: I61c3a1ea9015599dc45bd9e656f99f6bf8c4ec02
Wale Ogunwale [Thu, 17 Dec 2015 18:27:23 +0000 (10:27 -0800)]
Use accessor methods to get/set visibleBehindActivity
The accessor methods have protection against the stack been
in a detached state. Reading the field directly can lead to
an NPE when the stack is detached.
Bug:
26209403
Change-Id: I66fc1871ea96504cf1bcbc72cae9b564d6527bce
Steve McKay [Thu, 17 Dec 2015 18:29:08 +0000 (18:29 +0000)]
Merge "Eliminate dialog mode from DocumentsUI."
Gustav Sennton [Thu, 17 Dec 2015 18:04:38 +0000 (18:04 +0000)]
Merge "Allow several valid signatures per WebView provider."
Filip Gruszczynski [Thu, 17 Dec 2015 17:57:49 +0000 (17:57 +0000)]
Merge "Only add noDisplay activities to freeform source tasks."
Filip Gruszczynski [Wed, 16 Dec 2015 21:46:38 +0000 (13:46 -0800)]
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
Samuel Tan [Thu, 17 Dec 2015 17:55:24 +0000 (09:55 -0800)]
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
Samuel Tan [Thu, 17 Dec 2015 17:53:44 +0000 (09:53 -0800)]
Merge "Fix PersistableBundle handling in Parcel.writeValue" am:
d12959193c
am:
d3decff052
* commit '
d3decff052c4f7471a21fbbb116b32586181b391':
Fix PersistableBundle handling in Parcel.writeValue
Samuel Tan [Thu, 17 Dec 2015 17:52:47 +0000 (09:52 -0800)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Samuel Tan [Thu, 17 Dec 2015 17:52:11 +0000 (09:52 -0800)]
Merge "Specify path for native PersistableBundle implementation" am:
477fa220b1
am:
0bc7647f63
* commit '
0bc7647f63bcdf2d63ee71d770f9514a239eaba8':
Specify path for native PersistableBundle implementation
Alan Viverette [Thu, 17 Dec 2015 17:51:53 +0000 (17:51 +0000)]
Merge "Propagate TextView drawable state after resolving RTL drawables"
Steve McKay [Tue, 15 Dec 2015 20:16:21 +0000 (12:16 -0800)]
Eliminate dialog mode from DocumentsUI.
DocumentsActivity to Use standard drawer layout at all display resolutions.
Bug:
26208032
Change-Id: I3b93c81bf97045744074a299e92cdea4aae7628d
Alan Viverette [Thu, 17 Dec 2015 17:42:39 +0000 (12:42 -0500)]
Handle null result from getVirtualChildAt()
Also adds final where the method was being called, adds Nullable
annotation to method, and updates docs.
Bug:
25985497
Change-Id: I847a8507f2e3970f1340cddf4abf8650dda22b35
Gustav Sennton [Thu, 17 Dec 2015 15:49:33 +0000 (15:49 +0000)]
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
Filip Gruszczynski [Wed, 16 Dec 2015 03:17:09 +0000 (19:17 -0800)]
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
Alan Viverette [Thu, 17 Dec 2015 16:38:42 +0000 (16:38 +0000)]
Merge "Don't call public non-final getResources() from getAssets()"
Winson Chung [Wed, 16 Dec 2015 21:49:36 +0000 (16:49 -0500)]
Refactoring to AnimatedEvent.
Change-Id: I87ce63201120dc687eccd63024801cc2c19bebd6
Winson Chung [Thu, 17 Dec 2015 15:27:55 +0000 (10:27 -0500)]
Fixing minor issue with freeform workspace not showing.
- Also slightly tweaking drop target sizes to be a bit smaller
Change-Id: I0e877e64acba5dd165c0d7a2cffb24dea88d673f
Matt Sarett [Thu, 17 Dec 2015 15:13:14 +0000 (15:13 +0000)]
Merge "Clean-ups for BitmapRegionDecoder"
Tomasz Mikolajewski [Thu, 17 Dec 2015 13:36:20 +0000 (13:36 +0000)]
Merge "Add tests for copying virtual typed files."
Esteban Talavera [Thu, 17 Dec 2015 10:59:16 +0000 (10:59 +0000)]
Merge "Device or profile owner can let another app manage app restrictions"
Mahaver Chopra [Thu, 17 Dec 2015 10:59:01 +0000 (10:59 +0000)]
Merge "Adding DPM.reboot"
Esteban Talavera [Thu, 10 Dec 2015 16:26:44 +0000 (16:26 +0000)]
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
Chris Banes [Thu, 17 Dec 2015 10:00:26 +0000 (10:00 +0000)]
Fix AlertDialog.setIcon() not working when called after show() pt.2
BUG:
26183328
Change-Id: I2bd8ff0315e04dd33fe720f0e5c32dec06747afc
Keisuke Kuroyanagi [Thu, 17 Dec 2015 08:51:35 +0000 (08:51 +0000)]
Merge "TextView tests: open context menu on right click."
Keisuke Kuroyanagi [Thu, 17 Dec 2015 08:50:42 +0000 (17:50 +0900)]
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
Keisuke Kuroyanagi [Mon, 7 Dec 2015 19:09:40 +0000 (11:09 -0800)]
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
Tomasz Mikolajewski [Thu, 17 Dec 2015 08:05:36 +0000 (08:05 +0000)]
Merge "Add support to virtual and typed files in StubProvider."
Tomasz Mikolajewski [Wed, 16 Dec 2015 07:23:00 +0000 (16:23 +0900)]
Add tests for copying virtual typed files.
Bug:
26147488
Change-Id: I44cfae518f4b6dfceed5b9f50b132e2acf161b3f
Wonsik Kim [Thu, 17 Dec 2015 07:05:51 +0000 (07:05 +0000)]
Merge "TIF: add signal detection feature for HW inputs"
Wonsik Kim [Thu, 26 Nov 2015 09:51:09 +0000 (18:51 +0900)]
TIF: add signal detection feature for HW inputs
Bug:
23820259
Change-Id: If7f03b49f7510ec405dfc4fb2b6f709b8c8b820d
Tomasz Mikolajewski [Mon, 14 Dec 2015 09:50:24 +0000 (18:50 +0900)]
Add support to virtual and typed files in StubProvider.
Bug:
26147488
Change-Id: I40a75547ff16bb7d45f36843c29692268b4291b6
Tomasz Mikolajewski [Thu, 17 Dec 2015 06:03:44 +0000 (06:03 +0000)]
Merge "Append a correct extension in case of copying virtual files."
Vladislav Kaznacheev [Thu, 17 Dec 2015 04:07:39 +0000 (04:07 +0000)]
Merge "Rename and simplify DropPermissionHolder"
Keisuke Kuroyanagi [Thu, 17 Dec 2015 04:05:49 +0000 (04:05 +0000)]
Merge "Change cursor shape to STYLE_HAND on ClickableSpans"
Shreyas Basarge [Thu, 17 Dec 2015 03:00:00 +0000 (03:00 +0000)]
Merge "Fixes NPE bug in JobScheduler.getAllPendingJobs()"
Tomasz Mikolajewski [Wed, 16 Dec 2015 08:08:37 +0000 (17:08 +0900)]
Append a correct extension in case of copying virtual files.
Bug:
26147488
Change-Id: I3e310c102e7c819ea16b47dfe7902d389cfc9d00
Tomasz Mikolajewski [Thu, 17 Dec 2015 02:04:22 +0000 (02:04 +0000)]
Merge "Fix CopyService after recent refactoring."
Tomasz Mikolajewski [Wed, 16 Dec 2015 06:19:01 +0000 (15:19 +0900)]
Fix CopyService after recent refactoring.
My recent CL broke tests badly. This time double checked.
Bug:
26218041
Bug:
26176231
Change-Id: Ia1f68d7cff83ec9c3cfb9bccb9c91ff092b25ced
Vladislav Kaznacheev [Tue, 15 Dec 2015 20:16:28 +0000 (12:16 -0800)]
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
Samuel Tan [Thu, 17 Dec 2015 00:54:03 +0000 (00:54 +0000)]
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
Samuel Tan [Thu, 17 Dec 2015 00:50:53 +0000 (00:50 +0000)]
Merge "Fix PersistableBundle handling in Parcel.writeValue"
am:
d12959193c
* commit '
d12959193c60254b6b03b2a60a9c6e598e9da2e5':
Fix PersistableBundle handling in Parcel.writeValue
Samuel Tan [Thu, 17 Dec 2015 00:49:19 +0000 (00:49 +0000)]
Merge "Specify path for native PersistableBundle implementation"
am:
477fa220b1
* commit '
477fa220b1766a3822171fa514983198e09daabb':
Specify path for native PersistableBundle implementation
Bryce Lee [Thu, 17 Dec 2015 00:42:08 +0000 (00:42 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am:
cae2f2415b am:
fc3762aafd am:
0ccc3a1cb5
am:
972c616ce2
* commit '
972c616ce2f83622e5529ef86c9d7f243a60b601':
Add UUID to BluetoothHeadsetClientCall
Adam Lesinski [Thu, 17 Dec 2015 00:40:32 +0000 (00:40 +0000)]
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
Eino-Ville Talvala [Thu, 17 Dec 2015 00:39:07 +0000 (00:39 +0000)]
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"
Eino-Ville Talvala [Thu, 17 Dec 2015 00:37:41 +0000 (00:37 +0000)]
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
Samuel Tan [Thu, 17 Dec 2015 00:35:58 +0000 (00:35 +0000)]
Merge "Add comments to keep Java and native binder PersistableBundle in sync"
Samuel Tan [Thu, 17 Dec 2015 00:35:43 +0000 (00:35 +0000)]
Merge "Fix PersistableBundle handling in Parcel.writeValue"
Samuel Tan [Thu, 17 Dec 2015 00:35:35 +0000 (00:35 +0000)]
Merge "Specify path for native PersistableBundle implementation"
Bryce Lee [Thu, 17 Dec 2015 00:28:04 +0000 (00:28 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am:
cae2f2415b am:
fc3762aafd
am:
0ccc3a1cb5
* commit '
0ccc3a1cb5487fb2640d749be698866475a2c435':
Add UUID to BluetoothHeadsetClientCall
Bryce Lee [Thu, 17 Dec 2015 00:20:34 +0000 (00:20 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am:
cae2f2415b
am:
fc3762aafd
* commit '
fc3762aafd58ff9eada0b5ed261de20a40d7b07a':
Add UUID to BluetoothHeadsetClientCall
Filip Gruszczynski [Thu, 17 Dec 2015 00:11:28 +0000 (00:11 +0000)]
Merge "If pinned stack is focused, look for the one below for logging."
Bryce Lee [Thu, 17 Dec 2015 00:09:56 +0000 (00:09 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
am:
cae2f2415b
* commit '
cae2f2415ba04eb854fdcdc6aa66c857ad7148d0':
Add UUID to BluetoothHeadsetClientCall
Tyler Gunn [Thu, 17 Dec 2015 00:09:55 +0000 (00:09 +0000)]
Merge "Remove dependency on android.telecom.Call in VideoCallImpl for testing."
Chris Craik [Thu, 17 Dec 2015 00:05:49 +0000 (16:05 -0800)]
Fix build
Change-Id: I1fc72636afc070257526ce1500e96e9b39089640
Bryce Lee [Thu, 17 Dec 2015 00:02:41 +0000 (00:02 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
Chris Craik [Wed, 16 Dec 2015 23:48:27 +0000 (23:48 +0000)]
Merge "Add TextureView support to new renderer/reorderer"
Adam Lesinski [Wed, 16 Dec 2015 23:44:25 +0000 (23:44 +0000)]
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
Matt Sarett [Wed, 9 Dec 2015 20:16:31 +0000 (15:16 -0500)]
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
Chris Craik [Wed, 16 Dec 2015 22:27:20 +0000 (14:27 -0800)]
Add TextureView support to new renderer/reorderer
bug:
22480459
Change-Id: I2e4c0bc6b904706132f3f5087ededc9cac9b40fb
Adam Lesinski [Wed, 16 Dec 2015 23:35:17 +0000 (23:35 +0000)]
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
Bryce Lee [Wed, 16 Dec 2015 23:33:59 +0000 (15:33 -0800)]
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
Adam Lesinski [Wed, 16 Dec 2015 23:25:45 +0000 (23:25 +0000)]
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
Eino-Ville Talvala [Wed, 16 Dec 2015 23:20:29 +0000 (23:20 +0000)]
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"
Adam Lesinski [Wed, 16 Dec 2015 23:16:18 +0000 (23:16 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638
am:
40d1ab91d2
* commit '
40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Wale Ogunwale [Wed, 16 Dec 2015 23:16:03 +0000 (23:16 +0000)]
Merge "Added config_defaultPictureInPictureBounds"
Eino-Ville Talvala [Wed, 16 Dec 2015 23:09:29 +0000 (23:09 +0000)]
Merge "Camera2: create new streams if surface size has changed"
am:
bcb636d423
* commit '
bcb636d4232bedfb421ecaa157f67b96a1b26944':
Camera2: create new streams if surface size has changed
Adam Lesinski [Wed, 16 Dec 2015 23:09:27 +0000 (23:09 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
am:
b2c5155638
* commit '
b2c51556382acd3981e5a6380e2fb3d85c2f68a5':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Fyodor Kupolov [Wed, 16 Dec 2015 23:07:20 +0000 (23:07 +0000)]
Merge "Introduced PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER"