OSDN Git Service
Etan Cohen [Fri, 20 Oct 2017 02:28:31 +0000 (02:28 +0000)]
Merge changes from topics "rtt_access_point_api_name", "rtt_aware"
* changes:
[RTT2] Rename API Ap -> AccessPoint, timestamp
[RTT2] Add support for RTT to Wi-Fi Aware peers
Beverly Tai [Fri, 20 Oct 2017 01:35:34 +0000 (01:35 +0000)]
Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297" into oc-dr1-dev-plus-aosp am:
a6b9a27c35" into oc-mr1-dev-plus-aosp
am:
11a7e42c8e -s ours
Change-Id: I867f4fbe0817122c169b946a8d5c00d662e49ef4
Beverly Tai [Fri, 20 Oct 2017 01:31:54 +0000 (01:31 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297 am:
edc549d78e" into oc-mr1-dev-plus-aosp
am:
d11e149269 -s ours
Change-Id: I8cb827ab0e34ab8538a88f23616dd27aa7bd3ff5
Nan Zhang [Fri, 20 Oct 2017 01:28:41 +0000 (01:28 +0000)]
Merge "Shard framework during Java compilation for target side." am:
6a90c3f793 am:
b06e03c134 am:
6b4f75ec4a
am:
0af34ddfc8
Change-Id: If69b59543f2c364c2f13551e2d952dbc79eb21f4
Android Build Merger (Role) [Fri, 20 Oct 2017 01:17:57 +0000 (01:17 +0000)]
Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297" into oc-dr1-dev-plus-aosp am:
a6b9a27c35" into oc-mr1-dev-plus-aosp
Beverly Tai [Fri, 20 Oct 2017 01:16:27 +0000 (01:16 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297" into oc-dr1-dev-plus-aosp
am:
a6b9a27c35
Change-Id: I22b9c537fb0f5e1b1414be25f20b6710d00e2f90
Android Build Merger (Role) [Fri, 20 Oct 2017 01:09:44 +0000 (01:09 +0000)]
TreeHugger Robot [Fri, 20 Oct 2017 01:09:08 +0000 (01:09 +0000)]
Merge "Prevent task in recents being empty when activity info in unavailable"
TreeHugger Robot [Fri, 20 Oct 2017 01:08:04 +0000 (01:08 +0000)]
Merge "Add support for dimension, and link with condition and added DurationMetric"
Suprabh Shukla [Fri, 20 Oct 2017 01:04:58 +0000 (01:04 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf am:
7078aaa62a am:
d6e80237d9
am:
d9430fb4fb
Change-Id: Ia2e06492a3ba705a644c26b2dc74e57d03c86ca9
Android Build Merger (Role) [Fri, 20 Oct 2017 00:59:12 +0000 (00:59 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297 am:
edc549d78e" into oc-mr1-dev-plus-aosp
Beverly Tai [Fri, 20 Oct 2017 00:56:21 +0000 (00:56 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297
am:
edc549d78e
Change-Id: I4fcd58e1471efc519e2c3bcba2d1bcdca4b747e9
Nan Zhang [Fri, 20 Oct 2017 00:50:31 +0000 (00:50 +0000)]
Merge "Shard framework during Java compilation for target side." am:
6a90c3f793 am:
b06e03c134
am:
6b4f75ec4a
Change-Id: Iba206e39782bf0ac8057470d856251a599a230c9
Suprabh Shukla [Fri, 20 Oct 2017 00:40:18 +0000 (00:40 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf am:
7078aaa62a am:
fa4d0a1d80
am:
fd58475dcc
Change-Id: Icb4d35307829cf4f16c7a30b46bfa219ede2fb16
Android Build Merger (Role) [Fri, 20 Oct 2017 00:39:30 +0000 (00:39 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297" into oc-dr1-dev-plus-aosp
Beverly Tai [Fri, 20 Oct 2017 00:36:59 +0000 (00:36 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a
am:
f2e1ef2297
Change-Id: I99d77a01bbd5992effb98cc2cec15a27ab78d223
Beverly Tai [Fri, 20 Oct 2017 00:36:59 +0000 (00:36 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a
am:
f2e1ef2297
Change-Id: I1d35f22d61dcb6dd29b0815999b4300656d84a19
Suprabh Shukla [Fri, 20 Oct 2017 00:33:21 +0000 (00:33 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf am:
7078aaa62a
am:
d6e80237d9
Change-Id: Id57a09b062896003af97edb7b25b8fd077004586
Nan Zhang [Fri, 20 Oct 2017 00:27:11 +0000 (00:27 +0000)]
Merge "Shard framework during Java compilation for target side." am:
6a90c3f793
am:
b06e03c134
Change-Id: I9ae5c3ae45cac0a53b81043f33af2fd2910e86f8
Suprabh Shukla [Fri, 20 Oct 2017 00:21:45 +0000 (00:21 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf am:
7078aaa62a
am:
fa4d0a1d80
Change-Id: Ifaa66862877cbdde99a93f2ba7c59f8f1da8a5f4
Nan Zhang [Fri, 20 Oct 2017 00:17:23 +0000 (00:17 +0000)]
Merge "Shard framework during Java compilation for target side."
am:
6a90c3f793
Change-Id: I1a24f704d3537bde1e4aaef5bd4edf4cc898bb04
Beverly Tai [Fri, 20 Oct 2017 00:17:11 +0000 (00:17 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours
am:
b6ecd1f88a
Change-Id: Id7edf88371f89d5ff9a4aad06c25cd133eb17415
TreeHugger Robot [Fri, 20 Oct 2017 00:10:04 +0000 (00:10 +0000)]
Merge changes from topic "health2_healthd_hwbinder"
* changes:
BatteryService serves IBatteryPropertiesRegistrar.
BatteryService: Use android.hardware.health@2.0.
Suprabh Shukla [Fri, 20 Oct 2017 00:02:54 +0000 (00:02 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf
am:
7078aaa62a
Change-Id: Ib2de51e856b8fe7da42c37490cb84bafee9ed2f7
Suprabh Shukla [Fri, 20 Oct 2017 00:01:26 +0000 (00:01 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf
am:
7078aaa62a
Change-Id: I00826913bfa33d529b3056c7d4a2b4a9215172d8
Beverly Tai [Thu, 19 Oct 2017 23:52:10 +0000 (23:52 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1
am:
260ef208ac -s ours
Change-Id: If5929149e8173cd14c15e9d4d6e513e10f96f876
Treehugger Robot [Thu, 19 Oct 2017 23:46:18 +0000 (23:46 +0000)]
Merge "Shard framework during Java compilation for target side."
Suprabh Shukla [Thu, 19 Oct 2017 23:43:16 +0000 (23:43 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c
am:
14164f1bdf
Change-Id: I6bea094bde1b97604d7769646d9b04f7e6b21ca2
Beverly Tai [Thu, 19 Oct 2017 23:37:21 +0000 (23:37 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16
am:
4dd01948c1
Change-Id: I7426cd9b8f68f80a924662b4870558974bad347b
Suprabh Shukla [Thu, 19 Oct 2017 23:22:43 +0000 (23:22 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9
am:
02d89a3c0c
Change-Id: If82c97668497ce72ad29b055b15646291df66157
TreeHugger Robot [Thu, 19 Oct 2017 23:20:52 +0000 (23:20 +0000)]
Merge "mididocs: clarify direction and add BLE-MIDI link"
Beverly Tai [Thu, 19 Oct 2017 23:11:55 +0000 (23:11 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294
am:
791d8a5b16
Change-Id: I0678613fd0293afeafa38c4ac9fb0a55fb4b3969
Suprabh Shukla [Thu, 19 Oct 2017 23:09:02 +0000 (23:09 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9
am:
29257874f9
Change-Id: I3852ef99532b956fd3280c49d6722c2aed1d79a6
Matthew Ng [Thu, 19 Oct 2017 23:04:30 +0000 (16:04 -0700)]
Prevent task in recents being empty when activity info in unavailable
When an app is unavailable to get its activity info, it will not have a
color, title or icon and it would look weird in recents. Therefore skip
adding it to the recents list when this occurs.
Test: manual
Change-Id: I1cf2f7f8ea5ce132159f6aabfbfae31df0187660
Fixes:
64236158
Beverly Tai [Thu, 19 Oct 2017 22:56:23 +0000 (22:56 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef
am:
5fda53b294
Change-Id: Idda35731b13787fb00e0c7474eebc5b7d8660251
Roozbeh Pournader [Thu, 19 Oct 2017 22:55:57 +0000 (22:55 +0000)]
Merge "Replace JNI portion of AndroidBidi with calls to ICU4J"
Suprabh Shukla [Thu, 19 Oct 2017 22:54:42 +0000 (22:54 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55
am:
a4454ba4a9
Change-Id: Ie24e5fc3ab442ca5c51ca79687d417ae563d631c
Yao Chen [Mon, 16 Oct 2017 17:33:26 +0000 (10:33 -0700)]
Add support for dimension, and link with condition and added DurationMetric
Now we support following metrics:
<Duration> of [app holding a wake lock], while [*this app*] is [in background] [AND] [screen is off]
[Slice] the output by [app name, wake lock name], with bucket size [30sec]
+ Also added onDumpReport() api in MetricsManager, it can be called from client to fetch the data from
statsd
+ Also added command line tool to dump the StatsLogReport from all metrics for debugging.
+ Synced proto from google3. with a pending cl (cr/
172359050)
TODO: We need to add tons of tests to test the Metrics. I will work on it after this CL so people
can be unblocked.
I locally test the duration metric with wake lock with an app that generates StatsLog events.
Test: statsd_test
and manual test, and run:
adb shell cmd stats dump-report
We have a default config, which contains a metrics to count PROCESS_START event sliced by
package name.
Change-Id: I4838cc6cf025c143b7e84f43040703a78121fd25
Suprabh Shukla [Thu, 19 Oct 2017 22:40:05 +0000 (22:40 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b
am:
d1150b7e55
Change-Id: Iac842a9f018f24c905d4e165362f5bf87470d296
Beverly Tai [Thu, 19 Oct 2017 22:39:14 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours
am:
bcdb9079ef
Change-Id: Id065bc6f31814aed56fce0ddd9a1b6378d9364ee
Suprabh Shukla [Thu, 19 Oct 2017 22:25:04 +0000 (22:25 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1
am:
55ffaea04b
Change-Id: I10a7a16d5463e4cbf7880b1979541ea82a56ddd3
Adam Lesinski [Thu, 19 Oct 2017 22:23:58 +0000 (22:23 +0000)]
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev am:
8da74b1bfd
am:
5fae742a1e
Change-Id: I7dfb1a020b1c3da9e0af5a7096fda0775751eab3
Beverly Tai [Thu, 19 Oct 2017 22:20:11 +0000 (22:20 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb
am:
7b1157a92e -s ours
Change-Id: I0e451cfd8bf662d959ace4f79b1181d27fce79e1
Suprabh Shukla [Thu, 19 Oct 2017 22:06:31 +0000 (22:06 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06
am:
cf8fe172a1
Change-Id: I8600883ef4cad6f8b11fc005fc9cfd62d84aeb08
Beverly Tai [Thu, 19 Oct 2017 22:06:02 +0000 (22:06 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c
am:
06bd19c1fb
Change-Id: I6f6cb9cf71ba1584b162d6b18c28c2825323e7be
Suprabh Shukla [Thu, 19 Oct 2017 21:55:31 +0000 (21:55 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef
am:
8fb52c8d06
Change-Id: I2d8cdac51baf7b8df6b903f0416e525e9ec44784
Beverly Tai [Thu, 19 Oct 2017 21:50:59 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b
am:
d7ece4da2c
Change-Id: Icfd3af47bed5a40d23d1a48ecbb654625898ca2f
Etan Cohen [Mon, 9 Oct 2017 22:57:28 +0000 (15:57 -0700)]
[RTT2] Rename API Ap -> AccessPoint, timestamp
API council feedback:
- Ap -> AccessPoint
- Timestamp -> add us unit
Bug:
65108607
Test: unit tests & integration test suite
Change-Id: I733ab9e07e7ced2fa15144eea2c395fe267ce974
Etan Cohen [Wed, 27 Sep 2017 20:58:42 +0000 (13:58 -0700)]
[RTT2] Add support for RTT to Wi-Fi Aware peers
Add API to specify RTT requests to Wi-FI Aware peers specified either
using their MAC address (out-of-band discovery) or their PeerHandle
(in-band discovery).
Bug:
65015034
Test: unit tests + integration tests
Change-Id: I1cb8e90cab7c1acc621576703c9d0c6f4f5ac8d4
Adam Lesinski [Thu, 19 Oct 2017 21:43:31 +0000 (21:43 +0000)]
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
am:
8da74b1bfd
Change-Id: Ifd3555db424136fe8a8057504df414f41fb020a1
jackqdyulei [Thu, 19 Oct 2017 21:43:15 +0000 (21:43 +0000)]
Reuse the BluetoothBatteryDrawable in QS detail am:
4b7f43bcae
am:
2cd25cfcee
Change-Id: I204b6cd1bfd4a54f17f09f9ca3549c4a98266618
Suprabh Shukla [Thu, 19 Oct 2017 21:41:08 +0000 (21:41 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5
am:
6f0e6952ef
Change-Id: Ie4cf94614784c4938776c8c6c37fff64e6cfa240
Beverly Tai [Thu, 19 Oct 2017 21:35:03 +0000 (21:35 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours
am:
dfbaa1fd8b
Change-Id: I3bcc1adb52f00e95ef31dc17fc29b2e0242bc753
jackqdyulei [Thu, 19 Oct 2017 21:31:54 +0000 (21:31 +0000)]
Reuse the BluetoothBatteryDrawable in QS detail
am:
4b7f43bcae
Change-Id: Ie5fd81010fae4660bb0fdd5d6d061fa535d86150
TreeHugger Robot [Thu, 19 Oct 2017 21:31:10 +0000 (21:31 +0000)]
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
Suprabh Shukla [Thu, 19 Oct 2017 21:25:06 +0000 (21:25 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours
am:
159648d6e5
Change-Id: I34260f4fd841084a9e91b89905d84004efb40b23
TreeHugger Robot [Thu, 19 Oct 2017 21:24:12 +0000 (21:24 +0000)]
Merge "Add storaged callbacks in StorageManagerService"
Beverly Tai [Thu, 19 Oct 2017 21:18:55 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
am:
f2b592726d -s ours
Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0
TreeHugger Robot [Thu, 19 Oct 2017 21:01:58 +0000 (21:01 +0000)]
Merge "Fail only if CONTROL_PRIVAPP_PERMISSIONS_ENFORCE"
Suprabh Shukla [Thu, 19 Oct 2017 20:57:26 +0000 (20:57 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28
am:
8b438236ce -s ours
Change-Id: Ib8c3a4e6e8e39e42aa640c9988d0dd2022f486ec
TreeHugger Robot [Thu, 19 Oct 2017 20:40:48 +0000 (20:40 +0000)]
Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint"
TreeHugger Robot [Thu, 19 Oct 2017 20:34:02 +0000 (20:34 +0000)]
Merge "Improved logging on autofill validators."
Chad Brubaker [Thu, 19 Oct 2017 20:25:58 +0000 (20:25 +0000)]
Merge "Make priv apps not trust user added CAs by default"
Donald Chai [Thu, 19 Oct 2017 19:33:56 +0000 (19:33 +0000)]
Merge "AAPT2: Sanitize resource qualifiers before using in split names."
Jin Qian [Sat, 14 Oct 2017 01:17:04 +0000 (18:17 -0700)]
Add storaged callbacks in StorageManagerService
Notify storaged about user login so that storaged can read proto
files from CE when they become available.
Test: adb shell storaged -p
Bug:
63740245
Change-Id: Id9bd7023e6cfcfe1e5adeab1f0603e04ef586e93
Android Build Merger (Role) [Thu, 19 Oct 2017 18:51:46 +0000 (18:51 +0000)]
Merge "Merge "Add storageId to moveObjects" am:
1f4f6d2a18 am:
18abf57e99 am:
59ff05a59f am:
3b997d0773"
Jerry Zhang [Thu, 19 Oct 2017 18:48:11 +0000 (18:48 +0000)]
Merge "Add storageId to moveObjects" am:
1f4f6d2a18 am:
18abf57e99 am:
59ff05a59f
am:
3b997d0773
Change-Id: I93d06954ceb4942e3efdbd9e5ce2ddb25dee8ab7
Fyodor Kupolov [Thu, 19 Oct 2017 18:45:29 +0000 (11:45 -0700)]
Fail only if CONTROL_PRIVAPP_PERMISSIONS_ENFORCE
Previously the error was also thrown if ro.control_privapp_permissions=log
Test: manual
Bug:
64693550
Change-Id: Ia87984e2e5902dd885feeb37f676956fa56b421c
TreeHugger Robot [Thu, 19 Oct 2017 18:47:02 +0000 (18:47 +0000)]
Merge "Start IoT System Service from SystemServer"
jackqdyulei [Thu, 19 Oct 2017 18:05:09 +0000 (11:05 -0700)]
Reuse the BluetoothBatteryDrawable in QS detail
BluetoothBatteryDrawable creates the drawable lazily using
the latest(and most correct) context. So it could get the
correct color from the theme.
Also add iconScale field in BluetoothBatteryDrawable so the size
of the battery icon could be scaled.
Bug:
67377756
Test: Manual - connected to bluetooth headphone and open the qs
page and detail page. Retest it after changing it to dark theme.
Change-Id: Ic6c871985a89a503221755eed4bc2605ab53f630
Jerry Zhang [Thu, 19 Oct 2017 18:36:22 +0000 (18:36 +0000)]
Merge "Add storageId to moveObjects" am:
1f4f6d2a18 am:
18abf57e99
am:
59ff05a59f
Change-Id: I024be0c75e20e58152dbe0c81e5548d70f06a925
Jerry Zhang [Thu, 19 Oct 2017 18:22:46 +0000 (18:22 +0000)]
Merge "Add storageId to moveObjects" am:
1f4f6d2a18
am:
18abf57e99
Change-Id: Ieb79d5a10307c47cd772ae5ef621717d5c90cdc2
Roozbeh Pournader [Sat, 14 Oct 2017 03:48:37 +0000 (20:48 -0700)]
Replace JNI portion of AndroidBidi with calls to ICU4J
We no longer need the native calls to ICU since we have ICU4J.
Fixes:
67786879
Test: bit FrameworksCoreTests:android.text.
Change-Id: Ib2ec93017000b4f0343756814ca388bd31457849
Jerry Zhang [Thu, 19 Oct 2017 18:11:49 +0000 (18:11 +0000)]
Merge "Add storageId to moveObjects"
am:
1f4f6d2a18
Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e
Jerry Zhang [Thu, 19 Oct 2017 17:55:34 +0000 (17:55 +0000)]
Merge "Add storageId to moveObjects"
Benedict Wong [Thu, 19 Oct 2017 17:48:53 +0000 (17:48 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am:
b6df7f0d35 am:
d3a5792024 am:
f92bfc3b77
am:
9c6f24d1ee
Change-Id: Ie9a43c7f0519a2d7ac3326944608190503804483
Benedict Wong [Thu, 19 Oct 2017 17:37:22 +0000 (17:37 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am:
b6df7f0d35 am:
d3a5792024
am:
f92bfc3b77
Change-Id: I49932a5fc048b4a60512fac45a3537f050397168
TreeHugger Robot [Thu, 19 Oct 2017 17:32:26 +0000 (17:32 +0000)]
Merge "getPinnedShortcuts() shouldn't crash with shortcuts with..."
Benedict Wong [Thu, 19 Oct 2017 17:26:19 +0000 (17:26 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am:
b6df7f0d35
am:
d3a5792024
Change-Id: I5bf43f78716769a6f1f90169f500e9eee7a91f18
Tobias Thierer [Thu, 19 Oct 2017 17:26:09 +0000 (17:26 +0000)]
Merge "Move most android.util.Mutable* classes to framework." am:
cd06caf10e am:
4719440f3f am:
23c2a6578b
am:
d6e61836ac
Change-Id: Ifec5c8457aa144a909dd694de15d66c550cd7fdc
Bill Yi [Thu, 19 Oct 2017 17:14:58 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
db768d45e0 -s ours
am:
9a5e67dba9 -s ours
Change-Id: I4b26cbf3a5f9c5fadb88bb90db948bc605cd48e5
Benedict Wong [Thu, 19 Oct 2017 17:14:53 +0000 (17:14 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
am:
b6df7f0d35
Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b
Tobias Thierer [Thu, 19 Oct 2017 17:10:40 +0000 (17:10 +0000)]
resolve merge conflicts of
5c9e47d28b24 to oc-mr1-dev-plus-aosp
am:
301bf35e2d -s ours
Change-Id: I94dc1b71d6c9a323173b75b2d71b7da841c460d9
Benedict Wong [Thu, 19 Oct 2017 17:06:30 +0000 (17:06 +0000)]
Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
Tobias Thierer [Thu, 19 Oct 2017 16:42:50 +0000 (16:42 +0000)]
Merge "Move most android.util.Mutable* classes to framework." am:
cd06caf10e am:
4719440f3f
am:
23c2a6578b
Change-Id: I990ecf36ee6d2cd1d55c7cb1e652a8998ff84f35
Tobias Thierer [Thu, 19 Oct 2017 16:31:25 +0000 (16:31 +0000)]
Merge "Move most android.util.Mutable* classes to framework." am:
cd06caf10e
am:
4719440f3f
Change-Id: I699ae1fdec65f8c0ed584c13424e922f226d3ce0
Tobias Thierer [Thu, 19 Oct 2017 16:18:44 +0000 (16:18 +0000)]
Merge "Move most android.util.Mutable* classes to framework."
am:
cd06caf10e
Change-Id: I25fd01bd4bc8c582e6cb79a03de47847b46bcb83
Tobias Thierer [Thu, 19 Oct 2017 16:08:07 +0000 (16:08 +0000)]
Merge "Move most android.util.Mutable* classes to framework."
Bill Yi [Thu, 19 Oct 2017 16:02:24 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
db768d45e0 -s ours
Change-Id: Ie3665e5f71cf66f0eb36741a42244043b70b78b4
TreeHugger Robot [Thu, 19 Oct 2017 15:52:22 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Makoto Onuki [Wed, 18 Oct 2017 19:52:45 +0000 (12:52 -0700)]
getPinnedShortcuts() shouldn't crash with shortcuts with...
... no activities.
Bug
67931644
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Change-Id: Icea651cf7880c5389467285e9cae3a52c4993669
Android Build Merger (Role) [Thu, 19 Oct 2017 15:33:57 +0000 (15:33 +0000)]
Merge "Merge "Settings: Fix leak of BroadcastReceiver intents" am:
3499af28c4 am:
1b4a0abdbb am:
517b35fa1c am:
d2ff3244dc"
Tobias Thierer [Thu, 19 Oct 2017 15:12:57 +0000 (16:12 +0100)]
resolve merge conflicts of
5c9e47d28b24 to oc-mr1-dev-plus-aosp
Test: This merge conflict was automatically resolved by meld.
The automatic resolution of the same merge conflict by meld
from cherrypicking this CL into internal-master has passed
Treehugger (and was already submitted).
Exempt-From-Owner-Approval: Resolving merge conflicts with no deltas
Change-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b
Manu Viswanadhan [Thu, 19 Oct 2017 15:31:41 +0000 (15:31 +0000)]
Merge "Settings: Fix leak of BroadcastReceiver intents" am:
3499af28c4 am:
1b4a0abdbb am:
517b35fa1c
am:
d2ff3244dc
Change-Id: I57c99fcf7698535177c23b62e45f8e1a032a7220
TreeHugger Robot [Thu, 19 Oct 2017 15:30:51 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 19 Oct 2017 15:29:04 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Beverly Tai [Thu, 19 Oct 2017 15:22:09 +0000 (15:22 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97 am:
93d9ac257d -s ours am:
1ce0456b99 am:
a9d3b4d806 am:
ea0b574ea5
am:
60b9835e7d -s ours
Change-Id: Ie97dd3b28cc068043f66311381750f6e07e66100
Beverly Tai [Thu, 19 Oct 2017 15:13:57 +0000 (15:13 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am:
e1adf2240f -s ours am:
3ca0cc0ae6 -s ours am:
01ae445966 am:
3d600ede6d am:
d34366e714 am:
9b0a6a3509 -s ours am:
f1a95220a3 am:
c6ca9254ed am:
7fd4bec14a am:
b00fd6bb97 am:
93d9ac257d -s ours am:
1ce0456b99 am:
a9d3b4d806 am:
1fa3f2a9d0" into oc-mr1-dev-plus-aosp
am:
09ec0dc6f6 -s ours
Change-Id: I876dac52695c20b472e9ec36f02e309967a483a9
Siyamed Sinir [Thu, 19 Oct 2017 15:08:42 +0000 (15:08 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04 am:
685b515140 am:
65f1a4c4c2 am:
b614e5560e am:
1d1aac8621
am:
8cd9c1e9ad
Change-Id: I01ce4add382ac8f4ae3462b165b6e5897e68c82b
Siyamed Sinir [Thu, 19 Oct 2017 14:54:54 +0000 (14:54 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am:
9f496fbbe0 am:
4973227cbf -s ours am:
dcdb0e6bbe am:
b24023a7e0 am:
c26e04b006 am:
2bab19f9aa am:
69cc90b01c am:
19a3c53841 am:
9950579eb5 am:
8621a28b04 am:
685b515140 am:
65f1a4c4c2 am:
b614e5560e am:
5cf9cbd3a3
am:
77c982f28b
Change-Id: I362db6f48b1a16700d3e374fae230969dd535996
OSDN Git Service
