OSDN Git Service
Winson Chung [Mon, 17 Jul 2017 23:45:13 +0000 (23:45 +0000)]
Merge "Fix issue with configuration update check." into oc-dr1-dev am:
8aaa5adae6
am:
d55ae0fd75
Change-Id: I26f4127e5d132f84d5963a7f520a19e593dcd235
Winson Chung [Mon, 17 Jul 2017 23:40:18 +0000 (23:40 +0000)]
Merge "Fix issue with configuration update check." into oc-dr1-dev
am:
8aaa5adae6
Change-Id: I242d4796e7b74e720daebbf274c849eb37100c03
TreeHugger Robot [Mon, 17 Jul 2017 23:30:22 +0000 (23:30 +0000)]
Merge "Fix issue with configuration update check." into oc-dr1-dev
Tim Murray [Mon, 17 Jul 2017 23:28:05 +0000 (23:28 +0000)]
Merge "power: throttle interaction hints" into oc-dr1-dev am:
d12ecb1ed5
am:
d7e258116a
Change-Id: Ie12d0f6e1f212245f55b0440ffd2f696a206ce4a
Tim Murray [Mon, 17 Jul 2017 23:23:37 +0000 (23:23 +0000)]
Merge "power: throttle interaction hints" into oc-dr1-dev
am:
d12ecb1ed5
Change-Id: I1c83b7fd89f15e08188512156db42bed5c073b41
Tim Murray [Mon, 17 Jul 2017 23:16:41 +0000 (23:16 +0000)]
Merge "power: throttle interaction hints" into oc-dr1-dev
Mark Salyzyn [Mon, 17 Jul 2017 23:09:44 +0000 (23:09 +0000)]
Merge "BootReceiver: check console-ramoops-0" am:
a09784ac75 am:
e7715b35ea am:
be25a82472
am:
72c54c5113
Change-Id: I2d037b8c971cfef330e0d02045a50de759692e53
Neil Fuller [Mon, 17 Jul 2017 23:07:41 +0000 (23:07 +0000)]
Merge "Address post-commit review comments" am:
858634e4ec am:
5c15f6d6b1 am:
1a35cf3892
am:
d730ad43d5
Change-Id: I3ae3b91303cb13be200a6faa7151a1474db13c68
Android Build Merger (Role) [Mon, 17 Jul 2017 23:03:24 +0000 (23:03 +0000)]
Merge "Merge "Merge "Merge "Remove unnecessary TODOs" am:
a5c96cf4bf am:
08cff4c76b" into oc-dev-plus-aosp am:
c8eaf5a3a4" into oc-dr1-dev-plus-aosp am:
a09fa61cb3"
Neil Fuller [Mon, 17 Jul 2017 23:01:54 +0000 (23:01 +0000)]
Merge "Merge "Merge "Remove unnecessary TODOs" am:
a5c96cf4bf am:
08cff4c76b" into oc-dev-plus-aosp am:
c8eaf5a3a4" into oc-dr1-dev-plus-aosp
am:
a09fa61cb3
Change-Id: I04cc0c73ba1cf736ed72cf1de03b02112ab9c6aa
Android Build Merger (Role) [Mon, 17 Jul 2017 23:01:14 +0000 (23:01 +0000)]
Merge "Merge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am:
d726ff988c am:
84a4d3de65" into oc-dr1-dev-plus-aosp am:
9dd37a4818"
Michael Wachenschwanz [Mon, 17 Jul 2017 22:59:48 +0000 (22:59 +0000)]
Merge "Add Foreground Service Timer"
Benjamin Miller [Mon, 17 Jul 2017 22:59:30 +0000 (22:59 +0000)]
Merge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am:
d726ff988c am:
84a4d3de65" into oc-dr1-dev-plus-aosp
am:
9dd37a4818
Change-Id: Iedcddce61cca507db9654e599c18c80234519bb5
Mark Salyzyn [Mon, 17 Jul 2017 22:58:35 +0000 (22:58 +0000)]
Merge "BootReceiver: check console-ramoops-0" am:
a09784ac75 am:
e7715b35ea
am:
be25a82472
Change-Id: I389d8faf7d30b48bfafac17251216346eb9cb713
Benjamin Miller [Mon, 17 Jul 2017 22:53:30 +0000 (22:53 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am:
d726ff988c am:
8322920a7c
am:
eb3926819a
Change-Id: Ie1b099141194525571553f46f12d7fa0e305779d
Neil Fuller [Mon, 17 Jul 2017 22:53:29 +0000 (22:53 +0000)]
Merge "Address post-commit review comments" am:
858634e4ec am:
5c15f6d6b1
am:
1a35cf3892
Change-Id: I4f3bbd22c853b7fcb6f52e7e0543fc63712bfdbd
Android Build Merger (Role) [Mon, 17 Jul 2017 22:49:53 +0000 (22:49 +0000)]
Merge "Merge "Merge "Remove unnecessary TODOs" am:
a5c96cf4bf am:
08cff4c76b" into oc-dev-plus-aosp am:
c8eaf5a3a4" into oc-dr1-dev-plus-aosp
Neil Fuller [Mon, 17 Jul 2017 22:48:15 +0000 (22:48 +0000)]
Merge "Merge "Remove unnecessary TODOs" am:
a5c96cf4bf am:
08cff4c76b" into oc-dev-plus-aosp
am:
c8eaf5a3a4
Change-Id: I49dcec61ce9b64cf105b7432d9c73cf5e3edd8e7
Android Build Merger (Role) [Mon, 17 Jul 2017 22:48:03 +0000 (22:48 +0000)]
Merge "Merge "Remove TODOs that are not needed" am:
0f9842304a am:
5c2cfc51c5 am:
444616f4bf am:
34aca9e2c5 -s ours"
Android Build Merger (Role) [Mon, 17 Jul 2017 22:47:39 +0000 (22:47 +0000)]
Merge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am:
d726ff988c am:
84a4d3de65" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Mon, 17 Jul 2017 22:47:37 +0000 (22:47 +0000)]
Merge "Add activity manager command to watch uid state changes."
Mark Salyzyn [Mon, 17 Jul 2017 22:46:45 +0000 (22:46 +0000)]
Merge "BootReceiver: check console-ramoops-0" am:
a09784ac75
am:
e7715b35ea
Change-Id: I4ea86cc33247c2b7bf187cc8b2bc5b9c7aadc1f4
Neil Fuller [Mon, 17 Jul 2017 22:46:16 +0000 (22:46 +0000)]
Merge "Remove TODOs that are not needed" am:
0f9842304a am:
5c2cfc51c5 am:
444616f4bf
am:
34aca9e2c5 -s ours
Change-Id: If463092000dd2b843c6bb2ef97f5d3e7e931273b
Benjamin Miller [Mon, 17 Jul 2017 22:46:08 +0000 (22:46 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am:
d726ff988c
am:
84a4d3de65
Change-Id: I0c2013d5243abaaa892c638fe23b9a55896b4cdc
Benjamin Miller [Mon, 17 Jul 2017 22:45:39 +0000 (22:45 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am:
d726ff988c
am:
8322920a7c
Change-Id: I1605d6607d5057566164f03c6f9c87bfa7fa8546
Neil Fuller [Mon, 17 Jul 2017 22:44:54 +0000 (22:44 +0000)]
Merge "Address post-commit review comments" am:
858634e4ec
am:
5c15f6d6b1
Change-Id: I967e815611149c2fd9b6ca39e9fcf9eab3b23771
Android Build Merger (Role) [Mon, 17 Jul 2017 22:41:41 +0000 (22:41 +0000)]
Merge "Merge "Remove unnecessary TODOs" am:
a5c96cf4bf am:
08cff4c76b" into oc-dev-plus-aosp
Neil Fuller [Mon, 17 Jul 2017 22:40:28 +0000 (22:40 +0000)]
Merge "Remove TODOs that are not needed" am:
0f9842304a am:
5c2cfc51c5
am:
444616f4bf
Change-Id: I5f4265d738aa3669a0c7acb8df49b454a3e27f9c
Neil Fuller [Mon, 17 Jul 2017 22:40:01 +0000 (22:40 +0000)]
Merge "Remove unnecessary TODOs" am:
a5c96cf4bf
am:
08cff4c76b
Change-Id: I2682cc46391b6120ac846c011bee0eab30c55e86
Benjamin Miller [Mon, 17 Jul 2017 22:39:28 +0000 (22:39 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
am:
d726ff988c
Change-Id: I031f226a4324521a8940453c96da870a49767233
Benjamin Miller [Mon, 17 Jul 2017 22:37:35 +0000 (22:37 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
am:
d726ff988c
Change-Id: I42a62feffca60e8beb75e991ea0b6545a2813233
Mark Salyzyn [Mon, 17 Jul 2017 22:34:23 +0000 (22:34 +0000)]
Merge "BootReceiver: check console-ramoops-0"
am:
a09784ac75
Change-Id: Ic3af3fd4f768f391740d56bd73c7dcca7698d1de
Neil Fuller [Mon, 17 Jul 2017 22:32:38 +0000 (22:32 +0000)]
Merge "Remove TODOs that are not needed" am:
0f9842304a
am:
5c2cfc51c5
Change-Id: Ia585380cb88829bf55171092389b77081d941f17
Neil Fuller [Mon, 17 Jul 2017 22:32:37 +0000 (22:32 +0000)]
Merge "Address post-commit review comments"
am:
858634e4ec
Change-Id: Ia530cc2cdf583baae825386a52fdb8eb3763d99b
TreeHugger Robot [Mon, 17 Jul 2017 22:28:09 +0000 (22:28 +0000)]
Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev
Neil Fuller [Mon, 17 Jul 2017 22:26:48 +0000 (22:26 +0000)]
Merge "Remove unnecessary TODOs"
am:
a5c96cf4bf
Change-Id: I1e03cd3fa9eef34218e4a4eb958fbb6dd0593be6
Treehugger Robot [Mon, 17 Jul 2017 22:24:39 +0000 (22:24 +0000)]
Merge "BootReceiver: check console-ramoops-0"
Neil Fuller [Mon, 17 Jul 2017 22:24:36 +0000 (22:24 +0000)]
Merge "Remove TODOs that are not needed"
am:
0f9842304a
Change-Id: Ie46a57ce88e25e40193b073c0add69adccc14a79
Neil Fuller [Mon, 17 Jul 2017 22:19:07 +0000 (22:19 +0000)]
Merge "Address post-commit review comments"
xutianguo [Mon, 17 Jul 2017 22:15:47 +0000 (22:15 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." am:
66af025fea am:
75bd16d2df am:
cf6e784219
am:
d40f00926a
Change-Id: I3c5469c4cf73968722f85593737db0e9225bf488
Neil Fuller [Mon, 17 Jul 2017 22:15:42 +0000 (22:15 +0000)]
Merge "Remove unnecessary TODOs"
Neil Fuller [Mon, 17 Jul 2017 22:15:08 +0000 (22:15 +0000)]
Merge "Remove TODOs that are not needed"
xutianguo [Mon, 17 Jul 2017 22:10:38 +0000 (22:10 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." am:
66af025fea am:
75bd16d2df
am:
cf6e784219
Change-Id: Id547d1512a28fd4f1ebb8c76fa4f23324d576de3
xutianguo [Mon, 17 Jul 2017 22:04:56 +0000 (22:04 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." am:
66af025fea
am:
75bd16d2df
Change-Id: I92e4e1268f6a7832cbc99396749eb7b89b19a57a
xutianguo [Mon, 17 Jul 2017 21:58:04 +0000 (21:58 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
am:
66af025fea
Change-Id: Iab47add488fd9f4e09f2d0a2aacb435b0cdb24d0
Treehugger Robot [Mon, 17 Jul 2017 21:47:31 +0000 (21:47 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
TreeHugger Robot [Mon, 17 Jul 2017 21:21:19 +0000 (21:21 +0000)]
Merge "Send less ranking reconsiderations and updates"
TreeHugger Robot [Mon, 17 Jul 2017 20:59:09 +0000 (20:59 +0000)]
Merge "Break the rules."
TreeHugger Robot [Mon, 17 Jul 2017 20:40:27 +0000 (20:40 +0000)]
Merge "Fix LongSamplingCounterArrayTest."
Mark Salyzyn [Fri, 14 Jul 2017 20:08:47 +0000 (13:08 -0700)]
BootReceiver: check console-ramoops-0
On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0
Test: none
Bug:
63058217
Change-Id: Ia68c0b5741c35cb35f10be6bbce93e0f0c92480f
TreeHugger Robot [Mon, 17 Jul 2017 20:28:04 +0000 (20:28 +0000)]
Merge "Enforce permission for print system APIs"
Tony Mantler [Mon, 17 Jul 2017 20:26:41 +0000 (20:26 +0000)]
Merge changes from topic 'AdbEnableController'
* changes:
Add ADB enable/disable PreferenceController
Move to newer mockito/robolectric
Tom Cherry [Mon, 17 Jul 2017 19:36:36 +0000 (19:36 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master am:
d600905e4a am:
94f7e0f7b9 -s ours
am:
3f4b2174fb -s ours
Change-Id: I91ec8e985fa5be962f0135be1b971ec3b53c6be7
Tim Murray [Fri, 14 Jul 2017 20:54:37 +0000 (13:54 -0700)]
power: throttle interaction hints
Don't send power HAL interaction hints more than every 100ms. Also can send userActivity
calls every 100ms too (down from 500ms).
Test: power HAL doesn't run every 8ms
bug
63632697
Change-Id: Ic986f6fc51e58f8060f7bf2d2ac61a9906be5c1f
Tom Cherry [Mon, 17 Jul 2017 19:31:37 +0000 (19:31 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master am:
d600905e4a
am:
94f7e0f7b9 -s ours
Change-Id: If546c3cd46fbceddd8e48553a88cda7b3abde3e9
TreeHugger Robot [Mon, 17 Jul 2017 19:27:42 +0000 (19:27 +0000)]
Merge "Don't preload quick contacts drawables"
Tom Cherry [Mon, 17 Jul 2017 19:26:01 +0000 (19:26 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
am:
d600905e4a
Change-Id: I6366391c3bb0c8df8d15427d32369f180c3f2060
Tom Cherry [Mon, 17 Jul 2017 19:20:58 +0000 (19:20 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
Jeff Sharkey [Mon, 17 Jul 2017 19:15:16 +0000 (13:15 -0600)]
Break the rules.
Test: none
Bug:
62270037
Change-Id: I042539ae90fdc0d80e9c0ff35aa0baf500b05811
xutianguo [Mon, 22 May 2017 06:03:33 +0000 (14:03 +0800)]
Make BluetoothStateChangeCallback oneway to prevent waiting on response.
Test: Connected bluetooth devices(included Headset/HID devices), and
made bluetooth enabling/disabling over 1000 times, no other side effect
observed.
Bug:
38485770
Change-Id: Ia3959d2441aece39a79ab2d662b57790a78df674
Signed-off-by: xutianguo <xutianguo@xiaomi.com>
(cherry picked from commit
95e1e21a639318bb3399c394707624393cfa2300)
Rebecca Silberstein [Mon, 10 Jul 2017 18:34:55 +0000 (11:34 -0700)]
WifiManager: deprecate and remove setWifiApEnabled
Officially deprecate and remove the setWifiApEnabled call.
Bug:
38436773
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: frameworks/base/wifi/tests/runtests.sh
Test: cts-tradefed run cts-dev --mo CtsNetTestCases -t android.net.wifi.cts.WifiManagerTest
Change-Id: Ifefe0b186d074b49ab1cc94e1c166117f3d7bdf7
Winson Chung [Mon, 17 Jul 2017 18:35:39 +0000 (11:35 -0700)]
Fix issue with configuration update check.
- We can hold a reference to the same configuration since it is updated
and re-dispatched. Instead, make a copy of the configuration to store
the last configuration state.
Fixes:
63755686
Test: Open Recents, rotate, ensure that the display bounds and task bounds
are calculated correctly.
Change-Id: Ie0d2b5a0fa479428614d9593a2379420ccbd2fb4
Benjamin Miller [Mon, 17 Jul 2017 11:01:35 +0000 (13:01 +0200)]
Docs-change: clarification of LauncherApps.getApplicationInfo()
Staged at: go/dac-stage/reference/android/content/pm/LauncherApps.html#getApplicationInfo(java.lang.String, int, android.os.UserHandle)
Test: make ds-docs and output staged
Bug:
38024981
Change-Id: I9f256d675433457b7c85fa111ed87d1147f1f2bc
nharold [Mon, 17 Jul 2017 18:22:18 +0000 (18:22 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner" am:
d1ffb13437 am:
e38e57c25d am:
43d17a6785
am:
d84a546a9d
Change-Id: Ie439eca6ec805e0c60574f21deef1d49574891c8
TreeHugger Robot [Mon, 17 Jul 2017 18:19:53 +0000 (18:19 +0000)]
Merge "Don't 'cmd vibrate' when on DND mode."
Sudheer Shanka [Mon, 17 Jul 2017 18:19:49 +0000 (11:19 -0700)]
Fix LongSamplingCounterArrayTest.
Test: bit FrameworksCoreTests:com.android.internal.os.LongSamplingCounterArrayTest
Change-Id: I46ae68c7435dba634639cff7e874de122b102042
Fredrik Roubert [Mon, 17 Jul 2017 18:12:32 +0000 (18:12 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am:
0f3d90eec8 -s ours am:
cd53e91851 am:
28f67840c6
am:
9337ec6e2d -s ours
Change-Id: I8abc0ead892281b576ea1663e5c73a9ebd1f905f
nharold [Mon, 17 Jul 2017 18:11:47 +0000 (18:11 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner" am:
d1ffb13437 am:
e38e57c25d
am:
43d17a6785
Change-Id: I97f1cda1efc1fb7d699b34ab725a205d3143bdad
TreeHugger Robot [Mon, 17 Jul 2017 18:07:33 +0000 (18:07 +0000)]
Merge "Add provider level support for PDF Thumbnails"
nharold [Mon, 17 Jul 2017 18:05:19 +0000 (18:05 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner" am:
d1ffb13437
am:
e38e57c25d
Change-Id: I59a8143162800f35748b1e145973743855faca09
Fredrik Roubert [Mon, 17 Jul 2017 18:04:35 +0000 (18:04 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am:
0f3d90eec8 -s ours am:
cd53e91851
am:
28f67840c6
Change-Id: Ifd1e474ff8b34e13dc66874008ea4b4346816c67
Fredrik Roubert [Mon, 17 Jul 2017 17:58:05 +0000 (17:58 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am:
0f3d90eec8 -s ours
am:
cd53e91851
Change-Id: I9c1955309c1669c49b0f7060c22de4767360a7c4
nharold [Mon, 17 Jul 2017 17:52:25 +0000 (17:52 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner"
am:
d1ffb13437
Change-Id: I2e8cde8a7be8bdbdeebb00df053fdc621d30cdec
Fredrik Roubert [Mon, 17 Jul 2017 17:50:02 +0000 (17:50 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
am:
0f3d90eec8 -s ours
Change-Id: If37c0a67a40a2b1ee0d5e3050cba38af5e932e83
Geoffrey Pitsch [Mon, 17 Jul 2017 17:42:18 +0000 (17:42 +0000)]
Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev am:
f99ac67bdb
am:
b618e8fe39
Change-Id: I08f58463bb236d11f45a77408be978463ae5f782
Geoffrey Pitsch [Mon, 17 Jul 2017 17:37:45 +0000 (17:37 +0000)]
Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev
am:
f99ac67bdb
Change-Id: Icf54f81733d19d91913989451a5fc07ff5f1566d
Geoffrey Pitsch [Mon, 17 Jul 2017 17:31:26 +0000 (17:31 +0000)]
Merge "Remove Keyguard owner info from RelativeLayout." into oc-dr1-dev
Neil Fuller [Mon, 17 Jul 2017 17:02:29 +0000 (18:02 +0100)]
Remove unnecessary TODOs
The classes under test are not part of a public
API so they are not tested via CTS.
Bug:
31008728
Test: make droid
Change-Id: If10db42b6e79728a6625708d35a04c5002164866
Neil Fuller [Mon, 3 Jul 2017 13:38:50 +0000 (14:38 +0100)]
Remove TODOs that are not needed
Remove TODOs to add classes to the system API that are not needed
(since they are used by a platform-only app).
Bug:
31008728
Test: make droid
Change-Id: I0d75686ddeae929e9d87c5ca8703a609a1450d76
Merged-In: I600e7b08853b86b27463193411cf85207ae09ce8
nharold [Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner"
Julia Reynolds [Tue, 11 Jul 2017 14:39:58 +0000 (10:39 -0400)]
Send less ranking reconsiderations and updates
- NotificationIntrusivenessExtractor does not need to reconsider
ranking for non intrusive notifications
- All adjustments (by group helper and the assistant) have been moved to
extractors so we can selectively send ranking updates instead of always
sending them.
Fixes:
62827235
Test: runtest systemui-notification
Change-Id: I2ea746c3883049abac0752788a3f4c2fa50c8064
Treehugger Robot [Mon, 17 Jul 2017 16:46:09 +0000 (16:46 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
TreeHugger Robot [Mon, 17 Jul 2017 16:44:47 +0000 (16:44 +0000)]
Merge "Add TimeZoneRulesDataContract to system API"
Esteban Talavera [Mon, 17 Jul 2017 16:34:29 +0000 (16:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev am:
daa1539a5e
am:
1f439e4bc7
Change-Id: I99b1d51c154bcda4121fd818ec17a3c90431443d
Beverly [Mon, 17 Jul 2017 16:27:34 +0000 (16:27 +0000)]
Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev am:
47e4fde159
am:
7be3f44673
Change-Id: If5fa613b100a5d216575ad4f53523f706edcfc07
Esteban Talavera [Mon, 17 Jul 2017 16:27:30 +0000 (16:27 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
am:
daa1539a5e
Change-Id: I30d024c2d4e11f4e4c246b123723a00d28af78ee
TreeHugger Robot [Mon, 17 Jul 2017 16:14:44 +0000 (16:14 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev
Beverly [Mon, 17 Jul 2017 16:13:34 +0000 (16:13 +0000)]
Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev
am:
47e4fde159
Change-Id: Ic154e4fea33cbec26407598325c44a4dcbbcceb7
Felipe Leme [Sat, 15 Jul 2017 00:25:59 +0000 (17:25 -0700)]
Don't 'cmd vibrate' when on DND mode.
Test: manual verification
Fixes:
63509844
Change-Id: Ia9ce40d84427f2374a92117cfa49829e90bcb2c9
TreeHugger Robot [Mon, 17 Jul 2017 15:59:04 +0000 (15:59 +0000)]
Merge "Added check for AOD before showing volume dialog." into oc-dr1-dev
Andrew Scull [Mon, 17 Jul 2017 15:53:36 +0000 (15:53 +0000)]
Merge "Credential FRP: remove GateKeeper"
Makoto Onuki [Mon, 17 Jul 2017 15:50:18 +0000 (08:50 -0700)]
Don't preload quick contacts drawables
They were used as an overlay for contacts icons by mostly 1p apps,
but those apps have switched to circular contacts icons, and stopped
using the overlay.
Bug
63136392
Test: build and boot
Change-Id: I442148189061db7bb5baada0b9ca824f82535272
Geoffrey Pitsch [Mon, 17 Jul 2017 13:31:55 +0000 (09:31 -0400)]
Remove Keyguard owner info from RelativeLayout.
Altering other elements in the layout was forcing unnecessary
changes on the marquee scrolling.
Fixes:
62400546
Test: manual
Change-Id: Ib9cccb91b6a95e614917eacfddb91624aea3ba27
Benjamin Miller [Mon, 17 Jul 2017 14:45:19 +0000 (14:45 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am:
ca007e525b am:
2ecc198877
am:
3404cc761c
Change-Id: Ifb719b609626416378aec05715717156774e575a
Benjamin Miller [Mon, 17 Jul 2017 14:41:07 +0000 (14:41 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am:
ca007e525b am:
3082216de2
am:
105c3b1df4
Change-Id: Ic23b650fdd29739f312bf62fbab52196429c3f2e
Wyatt Riley [Mon, 17 Jul 2017 14:38:58 +0000 (14:38 +0000)]
Merge "Improved GNSS state debug logs" into oc-dr1-dev am:
bd2d9f8fdf
am:
05df03461e
Change-Id: I07fe2ab0090ffeebe90e62079db7926974b3b86d
Benjamin Miller [Mon, 17 Jul 2017 14:38:56 +0000 (14:38 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am:
ca007e525b
am:
2ecc198877
Change-Id: I6d74a3bd8e7c84f4f2a571f83888a0f9d485dc27
Benjamin Miller [Mon, 17 Jul 2017 14:32:30 +0000 (14:32 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev am:
ca007e525b
am:
3082216de2
Change-Id: Id9720c51f6192831ede99fd0af0451b43026e663
Wyatt Riley [Mon, 17 Jul 2017 14:28:33 +0000 (14:28 +0000)]
Merge "Improved GNSS state debug logs" into oc-dr1-dev
am:
bd2d9f8fdf
Change-Id: I414ff67d392f5d11a2b5919556ceff6fc6e1b393
Benjamin Miller [Mon, 17 Jul 2017 14:23:25 +0000 (14:23 +0000)]
Merge "Docs: VPNs under Android O should promote to the foreground" into oc-dev
am:
ca007e525b
Change-Id: If2a06d8e8e5fe2034e22c86dabf68bf7d3f79bb0
OSDN Git Service
