OSDN Git Service
Evan Laird [Fri, 23 Jun 2017 20:05:33 +0000 (16:05 -0400)]
Use BatteryMeterDrawableBase as QS icon for Battery Saver
This ensures that QS, Settings, and Status bar all use the same drawable
base so they will always look the same. Battery saver is essentially a
full battery that always shows the power saver iconography.
Test: visual; runtest -x
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Bug:
62668861
Change-Id: I8a9d5e59c9bb38c0ef794a0ed591195809521f70
TreeHugger Robot [Wed, 14 Jun 2017 16:14:32 +0000 (16:14 +0000)]
Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev
Philipp Weiß [Wed, 14 Jun 2017 15:16:48 +0000 (15:16 +0000)]
Merge "Use SystemUI Dialog Theme for QSSecurityFooter dialog" into oc-dr1-dev
Philip P. Moltmann [Wed, 14 Jun 2017 14:52:18 +0000 (14:52 +0000)]
Merge "Select the right pages to scrap" into oc-dev
am:
890cb59003
Change-Id: Id04b03520dfe63f5b11ee5b17841165a477a8f79
Philip P. Moltmann [Wed, 14 Jun 2017 14:44:30 +0000 (14:44 +0000)]
Merge "Select the right pages to scrap" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:46:11 +0000 (13:46 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
am:
2a0b423cd4
Change-Id: I97266821c07fd307dbe04e5d715792e57bfa9c0d
Jason Monk [Wed, 14 Jun 2017 13:37:28 +0000 (13:37 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:36:38 +0000 (13:36 +0000)]
Merge "Revert Early version of new volume" into oc-dr1-dev
Grace Chen [Wed, 14 Jun 2017 13:35:34 +0000 (13:35 +0000)]
Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
phweiss [Tue, 13 Jun 2017 13:23:13 +0000 (15:23 +0200)]
Use SystemUI Dialog Theme for QSSecurityFooter dialog
Without the ContextThemeWrapper, the dialog's text color
gets changed whenever the QS theme changes.
Bug:
62534577
Test: manual, CTS Verifier > Managed Provisioning > Device Owner Tests
> Network Logging UI
Change-Id: I408902688b97bb3c6dff06215b12956ae49a4806
(cherry picked from commit
da9bee2623c358913cafc06b6d617d10e234777c)
Peng Xu [Wed, 14 Jun 2017 06:20:15 +0000 (06:20 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
am:
d27d5d9ea8
Change-Id: Ib34a45b6fe35f27f4b3093888cbecd70b8b71300
Peng Xu [Wed, 14 Jun 2017 06:12:37 +0000 (06:12 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
gopinath [Wed, 14 Jun 2017 04:37:29 +0000 (04:37 +0000)]
App launch test apk change
am:
0a2c9396a2
Change-Id: Icad70c318aecfa28b985b7a7c737e332c9024ab8
TreeHugger Robot [Wed, 14 Jun 2017 01:57:53 +0000 (01:57 +0000)]
Merge "Disable StatusBar logs" into oc-dr1-dev
Kevin Chyn [Wed, 14 Jun 2017 01:43:47 +0000 (01:43 +0000)]
Merge "Add assist gesture silence and wake settings" into oc-dr1-dev
Yifan Hong [Wed, 14 Jun 2017 01:20:09 +0000 (18:20 -0700)]
SensorManager: attach background thread to JavaVM
Test: pass
Bug:
62404135
Change-Id: Ic3c0849cd366f550cbdccbb9bb8d082c5c570c35
Eugene Susla [Wed, 14 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
am:
c041c7a34e
Change-Id: I0af2c5f93b8e0387f28f9c34c81b20ad5a9875e2
gopinath [Fri, 12 May 2017 22:37:37 +0000 (15:37 -0700)]
App launch test apk change
Support launching the app using the package name.
Remove the unused variables.
b/
33226470
Change-Id: I5b3829912782a9fc0c8f09cbd6fa9ee4b5b35314
(cherry picked from commit
a00259f47dc480f799a812a00f52e3c887aae4b0)
TreeHugger Robot [Wed, 14 Jun 2017 00:03:49 +0000 (00:03 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:51:06 +0000 (23:51 +0000)]
Merge "Add plugin hooks to DozeService" into oc-dr1-dev
Christopher Tate [Tue, 13 Jun 2017 23:34:51 +0000 (23:34 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
am:
796b510787
Change-Id: I8c87bb6ac0ed8867ffd36a6fe1692bfb933bf746
Adam Lesinski [Tue, 13 Jun 2017 23:32:22 +0000 (23:32 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am:
9274d87a0e
Change-Id: I1b62c2f6aeb7d7167a6bbf1e4b09124914c7936e
Lucas Dupin [Tue, 13 Jun 2017 23:30:15 +0000 (16:30 -0700)]
Disable StatusBar logs
Reverted DEBUG flag that was accidentally
set to true.
Test: make
Change-Id: Icb37d7831052f4bb1c3a1e2349f5af5270a9e932
TreeHugger Robot [Tue, 13 Jun 2017 23:27:10 +0000 (23:27 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:16:58 +0000 (23:16 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
Grace Chen [Tue, 13 Jun 2017 23:07:45 +0000 (16:07 -0700)]
Default CDMA subscription source to RUIM/SIM
Operators read CDMA subscription from RUIM/SIM now thus change
the default hardcoded preference everywhere. Add code clean-up to
make the default come from a single source, the Phone interface.
Additional rework proposed in http://b/
62299272, but this corrects
immediate issue where CDMA SSM was defaulting to NV instead of RUIM
/SIM and caused CSIM subscription to not load and 'no sim' symptom
for many users.
Bug:
62143087
Test: None
Change-Id: I32b1f1e40c736a566df824218a6565de851ce161
Winson Chung [Tue, 13 Jun 2017 22:55:00 +0000 (22:55 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
am:
167f0001b8
Change-Id: Ie180c311af24be6067ebf8cd24c6c1958dfe0c39
Brad Ebinger [Tue, 13 Jun 2017 22:51:28 +0000 (22:51 +0000)]
Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 22:43:46 +0000 (22:43 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
Todd Kennedy [Tue, 13 Jun 2017 22:39:40 +0000 (22:39 +0000)]
Merge "Save overlay paths as user state" into oc-dev
am:
508a5bade6
Change-Id: If46b58323883dcdeef72f0a394f79becca134c23
TreeHugger Robot [Tue, 13 Jun 2017 22:31:36 +0000 (22:31 +0000)]
Merge "Save overlay paths as user state" into oc-dev
Philip P. Moltmann [Tue, 13 Jun 2017 22:29:01 +0000 (15:29 -0700)]
Select the right pages to scrap
The code before overwrote some data the outside code expected to not be
modified which resulted in the scrapped pages to be offset.
Test: - cts-tradefed run cts-dev -m Print
- Tried to repro case in the bug
Bug:
62296301
Change-Id: If3f250dbca43125bbbe9faadc5183a6dbaa69481
Katsiaryna Naliuka [Tue, 13 Jun 2017 22:15:33 +0000 (22:15 +0000)]
Merge "Added a category for lockscreen settings." into oc-dr1-dev
Dianne Hackborn [Tue, 13 Jun 2017 21:57:33 +0000 (21:57 +0000)]
Merge "Fix issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
69c3a1d45a
Change-Id: Iff54638e534562f573b0dc4af26d66e203867d1d
TreeHugger Robot [Tue, 13 Jun 2017 21:51:46 +0000 (21:51 +0000)]
Merge "Fix issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
Christopher Tate [Tue, 13 Jun 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
am:
630a49aa4e
Change-Id: Ib2a4229a6b00810b9dd73733421f3ac7e57f2112
Jason Monk [Tue, 13 Jun 2017 21:43:35 +0000 (21:43 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
am:
02d5b79cf6
Change-Id: If250b772445628e26fd73d0c81f31ea89e74f7fa
TreeHugger Robot [Tue, 13 Jun 2017 21:36:45 +0000 (21:36 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:32:28 +0000 (21:32 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
Chad Brubaker [Tue, 13 Jun 2017 21:28:37 +0000 (21:28 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am:
4a0ea3e88f
Change-Id: I5dcc03662ab5babbfc5559257b1ecdf9568c9d49
TreeHugger Robot [Tue, 13 Jun 2017 21:19:14 +0000 (21:19 +0000)]
Merge "Change SlashDrawable semantics to fix QS crash" into oc-dr1-dev
Chad Brubaker [Tue, 13 Jun 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
Adam Lesinski [Tue, 13 Jun 2017 21:15:19 +0000 (14:15 -0700)]
Use UiContext with StrictMode Dialog
Bug:
62382723
Test: manual
Change-Id: I5cb5ac5de0800b31d0dad7698f9229873ff83e27
Jason Monk [Tue, 13 Jun 2017 17:47:54 +0000 (13:47 -0400)]
Fix footer not being hidden in detail panels
Was causing incorrect accessibility focus
Test: manual
Change-Id: Id487286eb9fa931b73349b0b0dfe772566c10e6d
Fixes:
62568126
Andreas Gampe [Tue, 13 Jun 2017 21:12:33 +0000 (21:12 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
am:
ab934ae8e6
Change-Id: I7cdc522995f3b10d70cd6dced7dd4850eb542c71
Christopher Tate [Tue, 13 Jun 2017 19:12:09 +0000 (12:12 -0700)]
Fix #
62545908 : 'metered' network jobs run without network
Test: JobSchedulerTestApp
Change-Id: I9c15022f5542163a27c6aaa4c3ee6b677cffd699
TreeHugger Robot [Tue, 13 Jun 2017 21:03:38 +0000 (21:03 +0000)]
Merge "Binder: Add more logging on Error" into oc-dev
Tyler Gunn [Tue, 13 Jun 2017 20:48:12 +0000 (20:48 +0000)]
Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev
Christopher Tate [Tue, 13 Jun 2017 19:11:09 +0000 (12:11 -0700)]
Send ACTION_SHUTDOWN broadcast to manifest receivers
Fix #
36767224
Test: manual
Change-Id: If8f1fa986b9b8f3c426e4c0623bbca6f96b7199c
TreeHugger Robot [Tue, 13 Jun 2017 19:17:37 +0000 (19:17 +0000)]
Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
Evan Laird [Tue, 13 Jun 2017 19:09:21 +0000 (15:09 -0400)]
Change SlashDrawable semantics to fix QS crash
SlashDrawable wraps a reference to Drawable in order to store the
intended Drawable and optionally draw a slash over it. As such, it
should probably have similar semantics to Drawable, in that it either
exists or doesn't; if you set SlashImageView's drawable to `null`, you'd
expect that the drawable goes away, not that the SlashDrawable's
contained Drawable goes away but the slash stays.
Test: runtest systemui
Change-Id: I34b92716cc60ba5043ab68ae09954f5a5e97e562
Fixes:
62525439
Todd Kennedy [Tue, 13 Jun 2017 15:24:32 +0000 (08:24 -0700)]
Save overlay paths as user state
Instead of maintaining a separate structure just for overlay
paths, store them as user state in the package setting. Also
centralize updating the overlay paths to avoid issues with
inconsistent updates.
Fixes:
36561125
Test: Manual
Change-Id: Iac1c987e8650074dbc564e332d5da1950fad6ac5
Bryce Lee [Tue, 13 Jun 2017 18:56:52 +0000 (18:56 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
am:
8ab4d11145
Change-Id: I5eec6ff604056b7095ac07afd9721a5223a584d8
Bryce Lee [Tue, 13 Jun 2017 18:50:57 +0000 (18:50 +0000)]
Merge "Address issues surrounding freezing by display." into oc-dev
Jason Monk [Tue, 13 Jun 2017 18:03:45 +0000 (14:03 -0400)]
Revert Early version of new volume
This reverts the volume-related pieces of
commit
16fbd9dd1d2d407aa0bc096800af2630c218cde8.
Test: manual
Change-Id: I346c616697b155361a26ec0ca48e313e4a9353b1
Fixes:
62572865
Dianne Hackborn [Tue, 13 Jun 2017 17:33:19 +0000 (10:33 -0700)]
Fix issue #
62390590: SecurityException in JobIntentService$...
...JobServiceEngineImpl$WrapperWorkItem.complete
When a job is in the process of stopping a job, we should no
longer allow new work to be dispatched for it.
Also there was an issue with how we determine wether a caller
is valid for the current job -- this was only based on the uid
of the currently running job, but of course that context could
be re-used for a new job of the same uid. Instead, we now create
a different callback binder for each client, so we can identify
the exact client each time it calls back. (This also allows us
to hang information about why the job last stopped on that
client state, so we can always report it.)
Finally make a bunch of classes final that should have been.
Test: bit CtsJobSchedulerTestCases:*
Change-Id: I1b00dd2da710414dd2898c4d39a5c528d54b95ea
Tyler Gunn [Fri, 26 May 2017 20:30:09 +0000 (13:30 -0700)]
Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT.
Used in handovers to tell the account we're handing over to which account
the call is from.
Test: Manual
Bug:
38027075
Change-Id: I9b61a5fce3e4f7344174a1b81f4964ca02b71ccd
Mady Mellor [Tue, 13 Jun 2017 15:16:56 +0000 (08:16 -0700)]
Add plugin hooks to DozeService
- Find out when the dreaming starts / stops
- Request the doze UI to show / hide
Bug:
62534409
Test: manual, have no plugin, check that doze still works as expected (i.e.
pick up gesture shows it, noti shows it)
Change-Id: I11618e47e0bab18423f0d89c8daf285d8c14d238
Adrian Roos [Fri, 2 Jun 2017 19:50:38 +0000 (12:50 -0700)]
AOD: Use double tap coordinates to trigger Ambient Indication
Bug:
38386446
Test: Double tap on AOD, verify that it still works. On device that supports double tap coordinates, verify that double tapping on ambient music opens ambient music.
Change-Id: Ic75ba731a980c9598c85927e83d2032f01da4822
(cherry picked from commit
44198f5124743f0d603eb4efa3b436bd96f32144)
Jason Monk [Tue, 13 Jun 2017 16:49:55 +0000 (12:49 -0400)]
Fix sysui depending on slow bt calls
Move calls to a background thread and cache the results to avoid
slowing down sysui when there are too many bluetooth devices.
Test: runtest systemui
Change-Id: Ica10e86ca6b2783c30ed9de68f1a91dc5cfdf068
Fixes:
38118549
Andreas Gampe [Mon, 12 Jun 2017 17:43:05 +0000 (10:43 -0700)]
Binder: Add more logging on Error
Try to add the Error's message to the abort, so that it shows up
when the logcat is missing.
Sample message:
'jni_internal.cc:508] JNI FatalError called: java.lang.Error thrown during binder transaction: java.lang.LinkageError: This is a test.'
(cherry picked from commit
58383ba095f552a58ed416736fe049126c647ffd)
Bug:
62514767
Test: m
Change-Id: I12026bb7a8ec9438db493f135ed5d0177187f702
Peter Qiu [Tue, 6 Jun 2017 21:39:12 +0000 (14:39 -0700)]
wifi: add API for retrieving Hotspot 2.0 OSU providers
For an R2 Passpoint AP, there might be zero or more OSU providers
associated it. Add an API to retrieve the associated OSU providers.
Bug:
62235301
Test: manual test by exercising this API in WifiTracker and verify
the content of the OSU provider
Change-Id: I2e730f0b16d80e0b97b4ce7cbd086b606e71eb0c
Merged-In: I2e730f0b16d80e0b97b4ce7cbd086b606e71eb0c
Bryce Lee [Mon, 12 Jun 2017 21:12:29 +0000 (14:12 -0700)]
Address issues surrounding freezing by display.
The first issue is the animating a display as a consequence of the
freezing due to configuration change during construction. This
additional animation is not expected and interferes with tests
expecting for the original display contents to be shown intact. This
CL addresses the issue by not freezing while the display is not ready
(before construction is finished).
The second problem addressed is book-keeping for
DisplayContentsAnimators in WindowAnimator. Currently, a getter
method is used internally to reference these animators, which
generates them if not present and adds them to the animation
iteration. In the case we set an animation on a display that no
longer exists (which can be the case after unfreezing), we end up
recreating this object. This can lead to us trying to animate a
non-existent DisplayContent. This CL prevents creating an animator
for a non-existent display and adjusts the methods using this getter
to handle this case.
Fixes:
62460846
Fixes:
62461229
Bug:
35486733
Bug:
62541591
Test: go/wm-smoke
Test: open and close projected android auto mode repeatedly and
ensure display correctness
Test: cts-tradefed run singleCommand cts-dev --module CtsMediaTestCases --test android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay
Change-Id: I60ade6f97440c8fa01b10e36c019865cf1fd0730
Narayan Kamath [Tue, 13 Jun 2017 10:40:46 +0000 (10:40 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
am:
c7ea7effde
Change-Id: Iff55674bc989986e14d0bcea3c71bad5751d4dcb
Katsiaryna Naliuka [Mon, 12 Jun 2017 15:35:01 +0000 (17:35 +0200)]
Added a category for lockscreen settings.
Bug:
62487664
Test: Built and flashed a system image, ran RunSettingsLibRoboTests.
Change-Id: I4f2b09622ec221caf9898d03fbad1db354c264ea
Narayan Kamath [Tue, 13 Jun 2017 10:32:22 +0000 (10:32 +0000)]
Merge "Eagerly serialize historical sessions" into oc-dev
Narayan Kamath [Mon, 12 Jun 2017 12:34:29 +0000 (13:34 +0100)]
Eagerly serialize historical sessions
mHistoricalSessions maintained a strong reference to a PackageInstallerSession,
which in turn kept references to Bitmaps and other heavy-weight objects around.
Since this field is primarily used for debugging, this change replaces it with
a String dump of the session in question. Each dump takes about 600bytes, which
is comparable to the sizes of the un-serialized raw objects.
Bug:
62485552
Test: Manual
Change-Id: I4949a64b538ab4a97384f4f8bc9a6ef155a4b128
Adam Vartanian [Tue, 13 Jun 2017 08:13:28 +0000 (08:13 +0000)]
Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev
Android Build Merger (Role) [Tue, 13 Jun 2017 02:32:13 +0000 (02:32 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7fc501184a -s ours" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 02:31:23 +0000 (02:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 02:30:19 +0000 (02:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7fc501184a -s ours
Change-Id: I418c08d5f5bf997d7e870bafc2a0b68f519dd990
TreeHugger Robot [Tue, 13 Jun 2017 02:20:34 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 02:18:42 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Winson Chung [Tue, 13 Jun 2017 01:41:18 +0000 (01:41 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
am:
b1cdc17dfb
Change-Id: I987d923b923e289baa76d5155cf6a7fe4d9ece6a
TreeHugger Robot [Tue, 13 Jun 2017 01:34:43 +0000 (01:34 +0000)]
Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev
TreeHugger Robot [Tue, 13 Jun 2017 01:18:45 +0000 (01:18 +0000)]
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev
Marie Janssen [Tue, 13 Jun 2017 01:04:55 +0000 (01:04 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
am:
68a4c91bb4
Change-Id: Ifdb4b625f21dcda5248071263aaf6936158efb39
Wale Ogunwale [Tue, 13 Jun 2017 01:01:51 +0000 (01:01 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am:
e1e0db8ca9
Change-Id: I2d854e36c31a8fa1cf74e5c5a536969ee94dc79b
Tianjie Xu [Tue, 13 Jun 2017 00:58:53 +0000 (00:58 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
am:
f40f297546
Change-Id: Id60cf7cf4b82f17fd094fa011bb54a543e636f48
Robert Carr [Tue, 13 Jun 2017 00:54:10 +0000 (00:54 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am:
42b3610adc
Change-Id: I3238399a26917f80bd4e33bb20142f62076e6f4f
TreeHugger Robot [Tue, 13 Jun 2017 00:45:40 +0000 (00:45 +0000)]
Merge "Protect broadcast used in settings for bond cancel" into oc-dev
Jorim Jaggi [Tue, 13 Jun 2017 00:41:40 +0000 (00:41 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
am:
bbd7dfc0a4
Change-Id: I80a618eb59f0479060a69ca4f0be8ac883a8d48d
Jeff Sharkey [Tue, 13 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev
am:
05b52d8ba5
Change-Id: I282786d353e3dc406c7123daa00d3e7fe43de7bc
Todd Kennedy [Tue, 13 Jun 2017 00:33:51 +0000 (00:33 +0000)]
Merge "Don't log all instant app resolutions" into oc-dev
am:
3ef0b8260f
Change-Id: I4ef141816c67957b0302be814315e2e739406c31
Vladislav Kaznacheev [Tue, 13 Jun 2017 00:31:02 +0000 (00:31 +0000)]
Merge changes from topic 'sysui-tooltip' into oc-dev
am:
3fbcec5b86
Change-Id: I7affdad6abfb283c0eec6718797f7d8580ea507b
Bill Yi [Tue, 13 Jun 2017 00:27:05 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c2a12b658 -s ours
Change-Id: I5f257f746717037d275e025c80581d1f4cccc67d
Will Brazil [Tue, 13 Jun 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev
am:
71029bf631
Change-Id: I99c6322d7e06262861eb0bb8be4ce8d4572ffbae
Jorim Jaggi [Tue, 13 Jun 2017 00:21:21 +0000 (00:21 +0000)]
Merge "resolve merge conflicts of
8f1d13300f73 to oc-dr1-dev" into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 00:10:34 +0000 (17:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5c4fec39dd96d826c34c06ea398e05fb53e3328
Auto-generated-cl: translation import
Jeff Sharkey [Tue, 13 Jun 2017 00:09:45 +0000 (00:09 +0000)]
Merge "Active camera apps can defy reserved cache space." into oc-dr1-dev
Bill Yi [Tue, 13 Jun 2017 00:05:16 +0000 (17:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: If1852e89c1a3732b3f85c47bfa108ee3f4d5fac7
Auto-generated-cl: translation import
Wale Ogunwale [Mon, 12 Jun 2017 23:51:13 +0000 (23:51 +0000)]
Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
TreeHugger Robot [Mon, 12 Jun 2017 23:41:57 +0000 (23:41 +0000)]
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
TreeHugger Robot [Mon, 12 Jun 2017 23:38:14 +0000 (23:38 +0000)]
Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
Eugene Susla [Sat, 10 Jun 2017 01:03:14 +0000 (18:03 -0700)]
Support associating with an already-paired device
This is required for migration scenario, where device(s) are already
paired(and thus no longer discoverable) but didn't go through companion
flow.
This also fixes a bug with filtering by mac address, which is also relevant to
the use-case of associating a specific device
Test: Pair with a device first, and call associate with a filter with its MAC
address and single device requested. Ensure the device is found.
Ensure only that device is ever returned when filtering by MAC address.
Bug:
62487084
Change-Id: Ic7cc6affc0648ad85b15620e8c3aba4b9fc91aa1
Winson Chung [Mon, 12 Jun 2017 22:30:14 +0000 (15:30 -0700)]
Minimal change to ensure events are propagated to the right DividerView.
- The RecentsDrawnEvent sent when Recents is first drawn can be racey, if
it is sent before the configuration change in Divider is dispatched, then
it will be posted for the old DividerView, which prior to ag/
2363241 was
still sending the correct resize calls (the animation is independent of
the view). For now, we register the event handler in Divider, and
instead proxy it to the current view when it is posted.
Bug:
62528361
Test: go/wm-smoke
Test: Play a movie in Play Movies, ensure the activity is resized
Change-Id: I665b0c6af55dea0db1916f5b041589bf72da3baf
Kevin Chyn [Fri, 9 Jun 2017 22:40:18 +0000 (15:40 -0700)]
Add assist gesture silence and wake settings
Bug:
37427306
Test: make -j56
Change-Id: I36da4d689a2aecf0cdd5e0549ede6d3e31f0e630
TreeHugger Robot [Mon, 12 Jun 2017 23:01:15 +0000 (23:01 +0000)]
Merge "Attempted fix for navigation bar flicker" into oc-dev
Marie Janssen [Fri, 9 Jun 2017 23:38:19 +0000 (16:38 -0700)]
Protect broadcast used in settings for bond cancel
Test: cancel pairing from notification tray
Bug:
62094630
Change-Id: Ia83a874c1ea9a1d9d5502609f81e94052bb5759c
(cherry picked from commit
977992f3fc9f4f6bb2d1f9536143327a6021c5d1)
Jeff Sharkey [Mon, 12 Jun 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Improve developer docs for storage APIs." into oc-dev