Tony Zhu
ed8581bf13
Merge "[API Review]Clarify method that obtain a component name" am: c128fa0f93
...
am: 7655d9dd0f
2018-11-19 18:57:35 -08:00
Tony Zhu
7655d9dd0f
Merge "[API Review]Clarify method that obtain a component name"
...
am: c128fa0f93
2018-11-19 18:45:54 -08:00
Tony Zhu
c128fa0f93
Merge "[API Review]Clarify method that obtain a component name"
2018-11-20 02:36:32 +00:00
Chen Xu
f4626014ea
Merge "Telephony light grey list clean up for Q" am: 71ca860ff7
...
am: 0daf5ca480
2018-11-19 18:19:00 -08:00
Chen Xu
0daf5ca480
Merge "Telephony light grey list clean up for Q"
...
am: 71ca860ff7
2018-11-19 18:07:43 -08:00
Chen Xu
71ca860ff7
Merge "Telephony light grey list clean up for Q"
2018-11-20 01:56:19 +00:00
Eugene Susla
6b833a4df8
Merge "Remove exclusive OWNERS for BitUtils" am: 26aff41aa5
...
am: 60e62c4e20
2018-11-19 17:44:39 -08:00
Eugene Susla
60e62c4e20
Merge "Remove exclusive OWNERS for BitUtils"
...
am: 26aff41aa5
2018-11-19 17:35:25 -08:00
Treehugger Robot
26aff41aa5
Merge "Remove exclusive OWNERS for BitUtils"
2018-11-20 01:20:44 +00:00
Etan Cohen
5faec91513
Merge "Add IPv6 link-local address generation from EUI-48" am: a2a9df3e3a
...
am: 674479afe5
2018-11-19 16:48:22 -08:00
Etan Cohen
674479afe5
Merge "Add IPv6 link-local address generation from EUI-48"
...
am: a2a9df3e3a
2018-11-19 16:38:06 -08:00
Etan Cohen
a2a9df3e3a
Merge "Add IPv6 link-local address generation from EUI-48"
2018-11-20 00:19:54 +00:00
Varun Shah
439ed702da
[automerger skipped] Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev am: 546ba589a2 am: 84376cb95a am: abff788177 -s ours
...
am: bc890b6608
2018-11-19 15:43:02 -08:00
Varun Shah
bc890b6608
[automerger skipped] Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev am: 546ba589a2 am: 84376cb95a
...
am: abff788177
2018-11-19 15:25:46 -08:00
Varun Shah
abff788177
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev am: 546ba589a2
...
am: 84376cb95a
2018-11-19 15:19:59 -08:00
Varun Shah
7f812ed0bb
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into pi-dev
...
am: c0175af954
2018-11-19 15:17:28 -08:00
Varun Shah
84376cb95a
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev
...
am: 546ba589a2
2018-11-19 15:11:59 -08:00
TreeHugger Robot
c0175af954
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into pi-dev
2018-11-19 22:50:20 +00:00
TreeHugger Robot
546ba589a2
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev
2018-11-19 22:49:58 +00:00
Eugene Susla
a931f9eec0
Remove exclusive OWNERS for BitUtils
...
BitUtils is a fairly generic place where all framework engineers should
be able to contribute reusable code.
Test: test after merge in gerrit UI
Change-Id: Ibd00f0618e3e85aab466cedc43605115994cca4f
2018-11-19 14:38:12 -08:00
Shuo Qian
75418ebfe2
Merge "Remove dummy subscription ids" am: 22d12411fd
...
am: f7a5ef5caa
2018-11-19 14:24:52 -08:00
Shuo Qian
f7a5ef5caa
Merge "Remove dummy subscription ids"
...
am: 22d12411fd
2018-11-19 14:11:16 -08:00
Shuo Qian
22d12411fd
Merge "Remove dummy subscription ids"
2018-11-19 22:03:58 +00:00
Mark Salyzyn
beea2153ab
Merge changes I664fb325,I5e289469 am: 701001688f
...
am: 833a491fab
2018-11-19 13:33:13 -08:00
Mark Salyzyn
833a491fab
Merge changes I664fb325,I5e289469
...
am: 701001688f
2018-11-19 13:01:21 -08:00
sqian
91412858b7
Remove dummy subscription ids
...
Test: Treehugger
Bug: 119144366
Change-Id: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e
Merged-In: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e
(cherry picked from commit bfde48f4ed
2018-11-19 12:54:44 -08:00
Treehugger Robot
701001688f
Merge changes I664fb325,I5e289469
...
* changes:
switch to using android-base/file.h instead of android-base/test_utils.h
Remove unused reference to android-base/test_utils.h
2018-11-19 20:25:30 +00:00
Dan Willemsen
f1c1db0153
Merge "Convert libwebviewchromium_plat_support to Android.bp" am: 1feeeba433
...
am: e9db0313a3
2018-11-19 11:09:45 -08:00
Dan Willemsen
e9db0313a3
Merge "Convert libwebviewchromium_plat_support to Android.bp"
...
am: 1feeeba433
2018-11-19 11:00:24 -08:00
Treehugger Robot
1feeeba433
Merge "Convert libwebviewchromium_plat_support to Android.bp"
2018-11-19 18:37:06 +00:00
tonyzhu
6ac54dc519
[API Review]Clarify method that obtain a component name
...
Change JavaDoc in CarrierConfigManager.java. Clarify what format
string will be set and get from the key. Using ComponentName methods
to convert.
Bug: 118675660
Test: build success.
Change-Id: I47db5b665808ef7dbc9081e0112a04958497d6fd
2018-11-20 02:04:27 +08:00
Andrew Solovay
0db8a96a7c
Merge "docs: Fixing typos." into pi-dev
...
am: 94a49c90a7
2018-11-19 09:57:19 -08:00
Andrew Solovay
94a49c90a7
Merge "docs: Fixing typos." into pi-dev
2018-11-19 17:37:52 +00:00
Alan Stokes
aa61c5cabe
Merge "Remove unused imports." am: e1a7e50790
...
am: 1c4a2b36a0
2018-11-19 05:31:48 -08:00
Alan Stokes
1c4a2b36a0
Merge "Remove unused imports."
...
am: e1a7e50790
2018-11-19 05:17:28 -08:00
Treehugger Robot
e1a7e50790
Merge "Remove unused imports."
2018-11-19 12:57:47 +00:00
Neil Fuller
ee231b550e
Merge "Track changes in system/timezone / libcore" am: 80a2e6e628
...
am: 1015ddf86b
2018-11-19 04:14:05 -08:00
Neil Fuller
1015ddf86b
Merge "Track changes in system/timezone / libcore"
...
am: 80a2e6e628
2018-11-19 03:58:20 -08:00
Neil Fuller
80a2e6e628
Merge "Track changes in system/timezone / libcore"
2018-11-19 11:38:14 +00:00
Alan Stokes
b451d0b46a
Remove unused imports.
...
Test: Builds.
Change-Id: Ifd361ec1cbb1e5240cf63ca9d6439cfc572a96d7
2018-11-19 11:35:57 +00:00
Remi NGUYEN VAN
4a66f9c79f
Merge "(Really) fix LingerMonitor rate limiting" am: 26213ed916
...
am: f506b778a9
2018-11-18 23:40:38 -08:00
Remi NGUYEN VAN
f506b778a9
Merge "(Really) fix LingerMonitor rate limiting"
...
am: 26213ed916
2018-11-18 23:26:25 -08:00
Treehugger Robot
26213ed916
Merge "(Really) fix LingerMonitor rate limiting"
2018-11-19 07:14:11 +00:00
Dan Willemsen
f25ac31a60
Convert libwebviewchromium_plat_support to Android.bp
...
See build/soong/README.md for more information.
Test: m libwebviewchromium_plat_support
Change-Id: Ia999010453d428ddc12d2316436520d866498d78
2018-11-18 19:16:55 -08:00
chen xu
f4c5c6ee96
Telephony light grey list clean up for Q
...
Bug: 112477300
Test: Telehony unit test
Change-Id: I9485abba093a96c91816d77c7273e1a38cb5182a
2018-11-18 18:56:00 -08:00
Neil Fuller
0ac8df0e9a
Track changes in system/timezone / libcore
...
The version information about time zone formats is moving
to a new libcore class TzDataSetVersion.
Bug: 119026403
Test: build
Change-Id: I6f80f16f9cd7e37fc04d75c89483497f4f00a6a5
2018-11-18 15:52:02 +00:00
Dan Willemsen
cd15068a88
Merge "Convert screencap and libjni_pacprocessor to Android.bp" am: 954b9825c6
...
am: 60d7bb00db
2018-11-17 12:27:52 -08:00
Dan Willemsen
60d7bb00db
Merge "Convert screencap and libjni_pacprocessor to Android.bp"
...
am: 954b9825c6
2018-11-17 12:18:12 -08:00
Treehugger Robot
954b9825c6
Merge "Convert screencap and libjni_pacprocessor to Android.bp"
2018-11-17 20:06:21 +00:00
Etan Cohen
a8923c5aea
Add IPv6 link-local address generation from EUI-48
...
Add a utility method to convert an EUI-48 to an IPv6 link-local
address based on RFC 4291 (EUI-64 generation) followed by RFC 4862.
Bug: 117605977
Test: atest MacAddressTest
Merged-In: I80b683e69da6beff3b37fc345fc15aa9610d09b7
Change-Id: I80b683e69da6beff3b37fc345fc15aa9610d09b7
2018-11-16 21:50:24 -08:00
