OSDN Git Service
TreeHugger Robot [Fri, 17 Mar 2017 20:48:28 +0000 (20:48 +0000)]
Merge "Send broadcast when user restrictions change."
Brian Carlstrom [Fri, 17 Mar 2017 20:32:59 +0000 (20:32 +0000)]
Merge "Dump native stack for background ANR if process is of interest"
TreeHugger Robot [Fri, 17 Mar 2017 20:22:36 +0000 (20:22 +0000)]
Merge "QS: Revert change to when user switcher is shown"
Makoto Onuki [Fri, 17 Mar 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Fix deadlock between activity manager and settings provider"
Alan Viverette [Fri, 17 Mar 2017 19:47:09 +0000 (19:47 +0000)]
Merge "Revert "Changing initial and default focus behavior""
Conrad Chen [Fri, 17 Mar 2017 19:39:37 +0000 (19:39 +0000)]
Merge "Block modifying types of channels"
Evan Rosky [Fri, 17 Mar 2017 19:39:15 +0000 (12:39 -0700)]
Revert "Changing initial and default focus behavior"
This is a soft revert.
This reverts commit
37df2dbab124452e04bf14784df9ab5c2f64e434
Change-Id: I7ac08c0ef514f7ce7a0b750e501a5333f4ffb6d2
TreeHugger Robot [Fri, 17 Mar 2017 19:37:57 +0000 (19:37 +0000)]
Merge "Adding an extras Bundle to MessagingStyle messages."
TreeHugger Robot [Fri, 17 Mar 2017 19:19:40 +0000 (19:19 +0000)]
Merge "Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays"
Makoto Onuki [Fri, 17 Mar 2017 18:50:13 +0000 (11:50 -0700)]
Fix deadlock between activity manager and settings provider
Test: manual
Bug
36028906
Change-Id: I20344608d79d174b468506056789c04d3bde510f
Jason Monk [Fri, 17 Mar 2017 18:49:47 +0000 (14:49 -0400)]
QS: Revert change to when user switcher is shown
Its making it inconsistently show up on the lock screen. Until
final behavior is decided, revert to old behavior.
Change-Id: Ifc69f2d5b527cc9ce5a174b16b8b605db26fc35b
Fixes:
36141544
Test: visual
Diego Perez [Fri, 17 Mar 2017 18:01:26 +0000 (18:01 +0000)]
Merge "Fix BitmapShader to work with adaptive icons"
TreeHugger Robot [Fri, 17 Mar 2017 17:57:26 +0000 (17:57 +0000)]
Merge "Disable large-ish parcel logging."
TreeHugger Robot [Fri, 17 Mar 2017 17:54:30 +0000 (17:54 +0000)]
Merge "Removed 'virtual' from autofill method names."
TreeHugger Robot [Fri, 17 Mar 2017 17:51:40 +0000 (17:51 +0000)]
Merge "Adding enabled state for remote actions."
Roshan Pius [Fri, 17 Mar 2017 17:40:54 +0000 (17:40 +0000)]
Merge "WifiConfiguration: Correct documentation for priority" am:
f5fa26bf25 am:
da34226f06
am:
9205ccf3ee
Change-Id: I33a6f328a4373c323bfe1b2de59273faf5c03695
Roshan Pius [Fri, 17 Mar 2017 17:39:37 +0000 (17:39 +0000)]
Merge "WifiConfiguration: Update psk documentation" am:
89c79ff632 am:
6b6f1b9e12
am:
28212c1b29
Change-Id: I478ebcd9f2d98e35a3ae408d027b67d69de79c09
Roshan Pius [Fri, 17 Mar 2017 17:34:10 +0000 (17:34 +0000)]
Merge "WifiConfiguration: Correct documentation for priority" am:
f5fa26bf25
am:
da34226f06
Change-Id: I4b01b13b9628a06040db3a49c2e7769b837cadf6
Roshan Pius [Fri, 17 Mar 2017 17:33:06 +0000 (17:33 +0000)]
Merge "WifiConfiguration: Update psk documentation" am:
89c79ff632
am:
6b6f1b9e12
Change-Id: I38ef25c794573c2a0c2817ca4e8cd1a8c2aa9250
Andrii Kulian [Fri, 17 Mar 2017 17:30:50 +0000 (10:30 -0700)]
Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays
MANAGE_ACTIVITY_STACKS permission allows moving stacks, tasks and
activities between corresponding parents. It makes no sense to
require more strict START_ANY_ACTIVITY permission to launch on
private display, as an activity still can be moved to it.
Bug:
34164473
Test: 'adb unroot' and run android.server.cts.ActivityManagerDisplayTests
Change-Id: I3b59127829c432e42a46630025eeddd152bce1b0
Roshan Pius [Fri, 17 Mar 2017 17:28:13 +0000 (17:28 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"
am:
f5fa26bf25
Change-Id: I37fd50fac3dc6c2db8c677d1a265fca73babf5da
Roshan Pius [Fri, 17 Mar 2017 17:26:57 +0000 (17:26 +0000)]
Merge "WifiConfiguration: Update psk documentation"
am:
89c79ff632
Change-Id: I3ac1ed89de58038cf7bcddcac7b090fc07a8e4b8
TreeHugger Robot [Fri, 17 Mar 2017 17:26:18 +0000 (17:26 +0000)]
Merge "Allow Instant Apps access PackageInfo of exposed apps"
Treehugger Robot [Fri, 17 Mar 2017 17:18:31 +0000 (17:18 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"
Treehugger Robot [Fri, 17 Mar 2017 17:17:50 +0000 (17:17 +0000)]
Merge "WifiConfiguration: Update psk documentation"
Tomasz Wasilczyk [Fri, 17 Mar 2017 16:34:50 +0000 (16:34 +0000)]
Merge "Add getProgramList call to the broadcast radio API."
Jerome Gaillard [Fri, 17 Mar 2017 16:29:32 +0000 (16:29 +0000)]
Merge "Update ColorFilter_Delegate following Change I5f74addd"
Jeff Sharkey [Fri, 17 Mar 2017 16:25:07 +0000 (10:25 -0600)]
Disable large-ish parcel logging.
This logging was originally added to track down very large log
messages that were causing Binder transactions to fail. We fixed
a handful of bugs that could have been causing this over in
32575987,
so this logging should no longer be needed in live builds. (In fact,
this logging is being triggered often enough to push other important
debugging information out of logs.)
Test: builds, boots
Bug:
36372780
Change-Id: I640192fbec35693673a2f22b7a82ce54f27937da
TreeHugger Robot [Fri, 17 Mar 2017 16:11:32 +0000 (16:11 +0000)]
Merge "Fix up QS edit UI"
Felipe Leme [Fri, 17 Mar 2017 00:13:25 +0000 (17:13 -0700)]
Removed 'virtual' from autofill method names.
Fixes:
36126001
Test: VirtualContainerActivityTest pass
Change-Id: I3b8fe835cd7c7f39c8e2cb8f2daca71b03236a1f
Neil Fuller [Fri, 17 Mar 2017 15:50:31 +0000 (15:50 +0000)]
Merge "Track library change in libcore." am:
ed9c176e16 am:
301f1d3645
am:
cef08e7482 -s ours
Change-Id: Ide1ba5f3864e13376e15c561a911d5e2394328fa
Brian Carlstrom [Sat, 11 Mar 2017 08:14:13 +0000 (00:14 -0800)]
Dump native stack for background ANR if process is of interest
Bug:
30112521
Bug:
36043456
Bug:
35241370
Test: make -j32 -k && flashall
Change-Id: I25b134ec24c534f3cfeb5a7c43195da3a6285d57
Roshan Pius [Thu, 16 Mar 2017 18:07:07 +0000 (11:07 -0700)]
WifiConfiguration: Correct documentation for priority
Addressing the concerns raised by API council for deprecating this
field.
Bug:
35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc
Neil Fuller [Fri, 17 Mar 2017 15:44:05 +0000 (15:44 +0000)]
Merge "Track library change in libcore." am:
ed9c176e16
am:
301f1d3645
Change-Id: Ifb24866783cab6a602ac5f3dd1df705ba93d931e
Roshan Pius [Thu, 16 Mar 2017 17:59:58 +0000 (10:59 -0700)]
WifiConfiguration: Update psk documentation
Adding some documentation to explain the expected contents of this
field.
Bug:
35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
Andrii Kulian [Fri, 17 Mar 2017 15:39:32 +0000 (15:39 +0000)]
Merge "Separate global and override config sent to client"
Neil Fuller [Fri, 17 Mar 2017 15:38:01 +0000 (15:38 +0000)]
Merge "Track library change in libcore."
am:
ed9c176e16
Change-Id: Iae6166cf055625947589b3a14b72ed7828738311
TreeHugger Robot [Fri, 17 Mar 2017 15:32:02 +0000 (15:32 +0000)]
Merge "Change dependency to standard mockito-target-minus-junit4"
Treehugger Robot [Fri, 17 Mar 2017 15:28:35 +0000 (15:28 +0000)]
Merge "Track library change in libcore."
TreeHugger Robot [Fri, 17 Mar 2017 15:27:44 +0000 (15:27 +0000)]
Merge "Protect against hiding while not attached"
Diego Perez [Wed, 15 Mar 2017 12:45:39 +0000 (12:45 +0000)]
Fix BitmapShader to work with adaptive icons
Test: Existing test should pass
Change-Id: Ie4c78eab4dfacf1eb6060d71edb98b836c4eff78
liangweikang [Fri, 17 Mar 2017 15:07:50 +0000 (15:07 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java" am:
c14d5db093 am:
79e9f380e2
am:
9b0784aa5f
Change-Id: I41f9d2d027138360d3a967c97dbf3aed69512650
liangweikang [Fri, 17 Mar 2017 14:57:55 +0000 (14:57 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java" am:
c14d5db093
am:
79e9f380e2
Change-Id: Ic9356edc395f68c5dda5a19a2efca31b5f16a068
liangweikang [Fri, 17 Mar 2017 14:51:58 +0000 (14:51 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java"
am:
c14d5db093
Change-Id: Ib1c17e2fe5f36e0230845ca123b0cd2cb7365154
TreeHugger Robot [Fri, 17 Mar 2017 14:48:11 +0000 (14:48 +0000)]
Merge "Removing 'delegate' from constant names"
Treehugger Robot [Fri, 17 Mar 2017 14:43:20 +0000 (14:43 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java"
Jason Monk [Fri, 17 Mar 2017 14:04:31 +0000 (10:04 -0400)]
Fix up QS edit UI
Turns out QS Edit mode didn't like the changes to dual target tiles.
Clean this up a bit.
Test: visual
Change-Id: I158fe8dba6729de102cfc592314ec483a969417d
Paul Duffin [Tue, 14 Mar 2017 16:37:39 +0000 (16:37 +0000)]
Change dependency to standard mockito-target-minus-junit4
The mockito-updated-target-minus-junit4 target was added because
some tests needed a later version of mockito than was available
through mockito-target-minus-junit4. Since the latter has now
been upgraded to 2.7.13 that is no longer true and so users of
mockito-updated-target-minus-junit4 can be switched to use
mockito-target-minus-junit4 instead.
Bug:
32912773
Test: make checkbuild && runtest systemui
Change-Id: If7e4dd26d7d0e93731856e9739a048c89a835333
Jason Monk [Fri, 17 Mar 2017 13:47:30 +0000 (09:47 -0400)]
Protect against hiding while not attached
Change-Id: I44b16d2644c80c737ffc16bf11cc1259e3c3984b
Fixes:
36137783
Test: Edit QS
Julia Reynolds [Fri, 17 Mar 2017 12:32:23 +0000 (08:32 -0400)]
Removing 'delegate' from constant names
Change-Id: I2ac4e3ae08f1084da34ea74fdd5177e2d58987af
Fixes:
35812334
Test: build
Jerome Gaillard [Fri, 17 Mar 2017 12:15:36 +0000 (12:15 +0000)]
Update ColorFilter_Delegate following Change I5f74addd
Test: layoutlib tests
Change-Id: Ifb18946edb0c40e0120868e211c99a304801e740
Neil Fuller [Wed, 22 Feb 2017 18:29:47 +0000 (18:29 +0000)]
Track library change in libcore.
Adding a required dependency on new shared library for tzdata code.
Bug:
31008728
Test: make
Merged-In: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
Change-Id: I40b725a97ae2bc258b1fd4b2312b6c60ff83fe64
Neil Fuller [Wed, 22 Feb 2017 18:29:47 +0000 (18:29 +0000)]
Track library change in libcore.
Adding a required dependency on new shared library for tzdata code.
Bug:
31008728
Test: make
Change-Id: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
Narayan Kamath [Fri, 17 Mar 2017 10:05:14 +0000 (10:05 +0000)]
Merge "fd_utils: address a couple of TODOs." am:
eae1ae9732 am:
a34d01d1ee
am:
8497b653f6
Change-Id: Ic8735187a22df886f07da887f12dddff248d1028
Narayan Kamath [Fri, 17 Mar 2017 09:58:12 +0000 (09:58 +0000)]
Merge "fd_utils: address a couple of TODOs." am:
eae1ae9732
am:
a34d01d1ee
Change-Id: I167e56d78a5a1ef6c2f1bcad891d5f20f4e07375
Narayan Kamath [Fri, 17 Mar 2017 09:51:35 +0000 (09:51 +0000)]
Merge "fd_utils: address a couple of TODOs."
am:
eae1ae9732
Change-Id: I8e4e92df3c1f0016de2c396345b7a0b4bc0e1cb6
Narayan Kamath [Fri, 17 Mar 2017 09:44:11 +0000 (09:44 +0000)]
Merge "fd_utils: address a couple of TODOs."
Narayan Kamath [Thu, 2 Mar 2017 17:30:03 +0000 (17:30 +0000)]
fd_utils: address a couple of TODOs.
Drink the android::base koolaid.
Test: make, boots
Change-Id: Ib24b9b59fa3490e80ba78be0199eafa676225b73
TreeHugger Robot [Fri, 17 Mar 2017 08:15:55 +0000 (08:15 +0000)]
Merge "Fixed cancel() and commit():"
TreeHugger Robot [Fri, 17 Mar 2017 06:42:58 +0000 (06:42 +0000)]
Merge "Sets accessibility title for autofill dataset picker."
Jakub Pawlowski [Fri, 17 Mar 2017 05:31:07 +0000 (05:31 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)" am:
74f2e1a303 am:
2fc3834f4d
am:
066e8551f1
Change-Id: If9ee85705e7c47820e23ad79a048e4c04c4cc11a
Jakub Pawlowski [Fri, 17 Mar 2017 05:26:26 +0000 (05:26 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)" am:
74f2e1a303
am:
2fc3834f4d
Change-Id: Iad555280f5d702c63c76a2399c8d02ac39749a77
Jakub Pawlowski [Fri, 17 Mar 2017 05:19:57 +0000 (05:19 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)"
am:
74f2e1a303
Change-Id: I3b6599937ddd04a9c13573d156cc721152c0005a
Jakub Pawlowski [Fri, 17 Mar 2017 05:13:44 +0000 (05:13 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)"
TreeHugger Robot [Fri, 17 Mar 2017 04:09:50 +0000 (04:09 +0000)]
Merge "Added a new AutofillCallback.EVENT_INPUT_UNAVAILABLE event."
TreeHugger Robot [Fri, 17 Mar 2017 04:06:46 +0000 (04:06 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"
Roshan Pius [Fri, 17 Mar 2017 03:59:36 +0000 (03:59 +0000)]
Merge "WifiConfiguration: Update psk documentation"
Joel Scherpelz [Fri, 17 Mar 2017 03:05:45 +0000 (03:05 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" am:
52f8421b77 am:
b8933942fc
am:
f9cd5cd81b
Change-Id: I5ebbe1a63da43f28b0d582bc7e6480ffe74195b7
liangweikang [Thu, 16 Mar 2017 11:22:15 +0000 (19:22 +0800)]
[BUG] fix NullPointerException in Notification.java
https://code.google.com/p/android/issues/detail?id=252835
Test: null
Change-Id: I6c575686c75b02ac938f35622b522fff25403c29
Signed-off-by: liangweikang <liangweikang900911@gmail.com>
Joel Scherpelz [Fri, 17 Mar 2017 02:59:11 +0000 (02:59 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" am:
52f8421b77
am:
b8933942fc
Change-Id: Ic1b6226da3cfb68eeb352c1f81df09733ab52e4d
Joel Scherpelz [Fri, 17 Mar 2017 02:53:11 +0000 (02:53 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
am:
52f8421b77
Change-Id: I5b5d5460f9fe7ed228ab32b2c63cb601be5e1edb
Felipe Leme [Thu, 16 Mar 2017 15:59:50 +0000 (08:59 -0700)]
Fixed cancel() and commit():
- Call removeSelfLocked() on cancelSessionLocked.
- Call removeSelf() after dispatching the PendingSaveRequest.
- Added a finalizer callback to PendingSaveRequest that calls removeSelf().
- Fixed SaveUi SnackBar so its actions are only triggered once.
- Reused removeSelfLocked() when needed.
- Removed unnecessary {} on some lambdas.
- Removed unnecessary mLock on PendingSaveRequest.
- Removed unnecessary mLock usage on PendingFillRequest.
Test: CtsAutoFillServiceTestCases (including new tests) pass
Test: manual verification
Fixes:
35721501
Fixes:
35844249
Change-Id: I9789218777b62a9558a602b8eaed0714d8b77fa0
Treehugger Robot [Fri, 17 Mar 2017 02:44:07 +0000 (02:44 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
Felipe Leme [Wed, 15 Mar 2017 19:33:01 +0000 (12:33 -0700)]
Added a new AutofillCallback.EVENT_INPUT_UNAVAILABLE event.
This event is called when:
- After notifyViewEntered() when autofill is disabled.
- After service returns an "empty" FillResponse to FillCallback.onSuccess().
BUG:
36056207
Test: LoginActivityTest.testAutofillCallbackDisabled
Test: LoginActivityTest.testAutofillCallbackNoDatasets
Test: VirtualContainerActivityTest.testAutofillCallbackDisabled
Test: VirtualContainerActivityTest.testAutofillCallbackNoDatasets
Change-Id: I7b8636473f738bf600aa96b28c77827b2cc78815
Karthik Ravi Shankar [Fri, 17 Mar 2017 02:34:02 +0000 (02:34 +0000)]
Merge "Add API to get compatibility display id"
Philip P. Moltmann [Fri, 17 Mar 2017 02:23:29 +0000 (02:23 +0000)]
Merge "TRON log important auto-fill events"
Andrii Kulian [Thu, 16 Mar 2017 18:06:24 +0000 (11:06 -0700)]
Separate global and override config sent to client
There is some flakiness in View#onConfigurationChanged callback -
if ViewRootImpl receives config update earlier than ActivityThread,
it may not detect the configuration change and skip inner updates.
Also now ViewRootImpl assumes that it receives the global config as
a param, but instead it gets merged config from WM. This means that
ViewRootImpl#sConfigCallbacks was sending incorrect values to the
recipients.
This CL switches to sending global and override configuration to the
client separately. Also in case if there is a corresponding activity,
it first updates it and waits for update callback to ViewRootImpl.
This way global config and override config for activity will always
be set first and resources will be updated before inner state of
ViewRootImpl is updated.
Bug:
35870157
Bug:
34164473
Test: android.server.cts.ActivityManagerDisplayTests
Test: testOnMovedToDisplayCallback
Change-Id: Ic9e7541cf25ecfac6ec90e48f7efb0ece91f657e
Chad Brubaker [Fri, 17 Mar 2017 00:56:25 +0000 (17:56 -0700)]
Allow Instant Apps access PackageInfo of exposed apps
Instant Apps can only see apps that explicitly expose a component via
android:visibleToInstantApp.
Bug:
34087569
Test: cts-tradefed run commandAndExit cts-dev -m
CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: Ibcba43597f545966abc883e90008369fb20d61ae
Jakub Pawlowski [Fri, 17 Mar 2017 01:22:36 +0000 (18:22 -0700)]
LE Maximum Advertising Data Length (1/4)
Add ability to check maximum advertising data length.
Bug:
30622771
Test: manual
Change-Id: I281f7e9f294c40a47a67a22809cc753b6693f7c4
Jakub Pawlowski [Fri, 17 Mar 2017 01:21:38 +0000 (01:21 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am:
15e69df921 am:
45e0c6ea7f
am:
d2da3a7874
Change-Id: I3b14feb1d470f818b48acf99b32785f653790cc2
TreeHugger Robot [Fri, 17 Mar 2017 01:19:45 +0000 (01:19 +0000)]
Merge "IBiometricsFingerprint uses "default" service name"
TreeHugger Robot [Fri, 17 Mar 2017 01:15:07 +0000 (01:15 +0000)]
Merge "Change vold cryptkeeper permissions to be more sensible"
Jakub Pawlowski [Fri, 17 Mar 2017 01:15:08 +0000 (01:15 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am:
15e69df921
am:
45e0c6ea7f
Change-Id: I6975c6629e8c4a7be20f355fdeaba268b33396a2
Jakub Pawlowski [Fri, 17 Mar 2017 01:09:02 +0000 (01:09 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am:
15e69df921
Change-Id: I585fc900b4a153744116fa87764db98b038184d5
Felipe Leme [Thu, 16 Mar 2017 21:36:47 +0000 (14:36 -0700)]
Sets accessibility title for autofill dataset picker.
Bug:
34219631
Test: CtsAutoFillServiceTestCases (with new tests) pass
Change-Id: I9bda820a41ef82e008f2a1ffd32c286b91841c10
Winson Chung [Fri, 17 Mar 2017 00:10:21 +0000 (17:10 -0700)]
Adding enabled state for remote actions.
- Actions can specify whether they are enabled (default) or disabled, and
SystemUI will reflect the state in the PiP actions.
Bug:
36363677
Test: Expand pip with dismissed action
Change-Id: I36994868f82d8ba0fc87947a722d9f20b39425a1
Treehugger Robot [Fri, 17 Mar 2017 01:01:15 +0000 (01:01 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
Yifan Hong [Fri, 17 Mar 2017 00:58:10 +0000 (00:58 +0000)]
Merge "Start android.frameworks.sensorservice@1.0 in system_server"
Joel Scherpelz [Wed, 15 Mar 2017 06:32:33 +0000 (15:32 +0900)]
Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces
This patch tries to change accept_ra_rt_info_max_plen to 64 from its
default value of 0 on kernels that support router advertisements with
route information options. The code fails silently on older unsupported
platforms.
Also factor existing startIPv6() code into a self documenting function
enableInterfaceIpv6PrivacyExtensions()
Bug:
33333670
Test: as follows
- build sailfish
- flashed
- booted
- runtest frameworks-net passes
- runtest frameworks-wifi passes
Change-Id: I10ec83b9e04836089477d74417b7222499820066
Derek Sollenberger [Fri, 17 Mar 2017 00:41:12 +0000 (00:41 +0000)]
Merge "Remove usage of deprecated makeImageSnapshot parameter Test: Does it compile?"
TreeHugger Robot [Fri, 17 Mar 2017 00:32:48 +0000 (00:32 +0000)]
Merge "Camera: Enable batching for constrained high speed recording"
Chris Craik [Fri, 17 Mar 2017 00:32:15 +0000 (00:32 +0000)]
Merge "Expose color filter mutate methods"
Jack He [Fri, 17 Mar 2017 00:21:31 +0000 (00:21 +0000)]
Merge "Add a flag that indicates whether in-band ringing is avalable" am:
41f5b61f5d am:
592d78238d
am:
90397ba054
Change-Id: I11c594bb6da104a85a1fd05138e7f224a3d18b09
Jack He [Fri, 17 Mar 2017 00:14:57 +0000 (00:14 +0000)]
Merge "Add a flag that indicates whether in-band ringing is avalable" am:
41f5b61f5d
am:
592d78238d
Change-Id: I47b79c0113f3452df40325df4d96952aa1c7d835
Fyodor Kupolov [Fri, 17 Mar 2017 00:13:58 +0000 (00:13 +0000)]
Merge "Handle stopped users in onCleanupUser"
Jack He [Fri, 17 Mar 2017 00:09:58 +0000 (00:09 +0000)]
Merge "Add a flag that indicates whether in-band ringing is avalable"
am:
41f5b61f5d
Change-Id: I25931f4ed056f6990c6ecb2d9f6629d89610c072
Treehugger Robot [Fri, 17 Mar 2017 00:00:16 +0000 (00:00 +0000)]
Merge "Add a flag that indicates whether in-band ringing is avalable"
Android Build Merger (Role) [Thu, 16 Mar 2017 23:55:57 +0000 (23:55 +0000)]
Merge "Merge "Merge "wifi: add a flag indicating legacy Passpoint configuration" am:
2d87679a11 am:
1228b6cdec" into nyc-mr2-dev-plus-aosp am:
01213393fb"
Yohei Yukawa [Thu, 16 Mar 2017 23:54:19 +0000 (23:54 +0000)]
Merge "Add a compat hack into SurfaceView#setWindowType()"
Peter Qiu [Thu, 16 Mar 2017 23:54:12 +0000 (23:54 +0000)]
Merge "Merge "wifi: add a flag indicating legacy Passpoint configuration" am:
2d87679a11 am:
1228b6cdec" into nyc-mr2-dev-plus-aosp
am:
01213393fb
Change-Id: Ic5ea3f8c8521e818ee771b20cdb4d43875d6daa7