OSDN Git Service
Tomasz Wasilczyk [Tue, 18 Jul 2017 15:36:22 +0000 (15:36 +0000)]
Merge "Implement ProgramSelector for font-end Java APIs."
TreeHugger Robot [Tue, 18 Jul 2017 13:55:51 +0000 (13:55 +0000)]
Merge "NetworkPolicyManagerService: Allow data saver to be on by default."
Paul Duffin [Tue, 18 Jul 2017 13:11:18 +0000 (13:11 +0000)]
Merge "Separate android.test.mock classes from android.test.runner"
Fredrik Roubert [Tue, 18 Jul 2017 11:21:28 +0000 (11:21 +0000)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t. am:
253e515259 am:
042534c352
am:
3d7c99a174 -s ours
Change-Id: Ib7d9441d1e97818fb7a852b0dcc297d915453327
Fredrik Roubert [Tue, 18 Jul 2017 11:14:55 +0000 (11:14 +0000)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t. am:
253e515259
am:
042534c352
Change-Id: I34b8a04b7589dc8cc5850aba5c3d50aa2c1b4e02
Fredrik Roubert [Tue, 18 Jul 2017 11:08:47 +0000 (11:08 +0000)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
am:
253e515259
Change-Id: I064ae78ad17bef67d6e90c7ce0aed4e9693c9ac6
Geoffrey Pitsch [Tue, 18 Jul 2017 10:35:17 +0000 (10:35 +0000)]
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev am:
331a287656
am:
3c778dc07a
Change-Id: I59b79e4591868ebd02a5a6f231b092290a878781
Geoffrey Pitsch [Tue, 18 Jul 2017 10:29:23 +0000 (10:29 +0000)]
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev
am:
331a287656
Change-Id: Ie00665beb58cfb797cfdc85c20adfb28988055b2
TreeHugger Robot [Tue, 18 Jul 2017 10:24:17 +0000 (10:24 +0000)]
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.
All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.
Bug:
37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29
Narayan Kamath [Mon, 17 Jul 2017 14:32:53 +0000 (15:32 +0100)]
NetworkPolicyManagerService: Allow data saver to be on by default.
This value is read from the global settings provider, and can be
configured via an overlay.
Bug:
63112872
Test: NetworkPolicyManagerServiceTest
Change-Id: If55ea08df1dd8440189f9b46a5606118de99c930
TreeHugger Robot [Tue, 18 Jul 2017 07:58:33 +0000 (07:58 +0000)]
Merge "IP connectivity metrics: fix tests after proto update"
Hugo Benichi [Tue, 18 Jul 2017 05:28:27 +0000 (14:28 +0900)]
IP connectivity metrics: fix tests after proto update
Update to ipconnectivity.proto in commit
6d2f506bfd788a3685292d404dc9d82a27357cfe broke the associated unit
tests (Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9)
Bug:
34901696
Test: runtest frameworks-net
Change-Id: I57a6bad8a9836b1c45690c4589b416786ce1dfa0
TreeHugger Robot [Tue, 18 Jul 2017 03:55:03 +0000 (03:55 +0000)]
Merge "Reference nativehelper/jni.h as jni.h"
Steven Moreland [Tue, 18 Jul 2017 02:00:43 +0000 (19:00 -0700)]
Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.
Bug:
63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af
TreeHugger Robot [Tue, 18 Jul 2017 00:54:41 +0000 (00:54 +0000)]
Merge "WebView: change setSafeBrowsingWhiteList signature"
Makoto Onuki [Tue, 18 Jul 2017 00:19:11 +0000 (00:19 +0000)]
Merge "Fix typo in sync log." into oc-dr1-dev am:
479b762f99
am:
0d126ceddb
Change-Id: If505ad732d3353bc21e4265230205fdf0f4f267d
Makoto Onuki [Tue, 18 Jul 2017 00:14:22 +0000 (00:14 +0000)]
Merge "Fix typo in sync log." into oc-dr1-dev
am:
479b762f99
Change-Id: Id9d3f896a534714eaf16762f80bc6c3a1c65b532
TreeHugger Robot [Tue, 18 Jul 2017 00:07:16 +0000 (00:07 +0000)]
Merge "Fix typo in sync log." into oc-dr1-dev
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
Nate Fischer [Mon, 17 Jul 2017 19:58:18 +0000 (12:58 -0700)]
WebView: change setSafeBrowsingWhiteList signature
* Renames WhiteList -> Whitelist
* Adds a callback to indicate malformed URLs to the application
Bug:
63660204
Bug:
63084528
Bug:
63765158
Test: N/A
Change-Id: Ia12f0822c5d3a339633a820c40bdbff4137f510b
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
Tomasz Wasilczyk [Wed, 12 Jul 2017 20:59:20 +0000 (13:59 -0700)]
Implement ProgramSelector for font-end Java APIs.
Bug: b/
32621193
Test: instrumentalization
Change-Id: Ibb9841fed76ef3568c2e36ca28ea31addf9175f1
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