OSDN Git Service
Sehee Park [Wed, 20 Feb 2019 11:44:53 +0000 (03:44 -0800)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal." am:
1d18e60e76
am:
87bba9d278
Change-Id: Ie3e8a250b24acf668fbcdb48b6242e1ea83ebfa2
Sehee Park [Wed, 20 Feb 2019 11:35:36 +0000 (03:35 -0800)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal."
am:
1d18e60e76
Change-Id: I8316ad19bb5633e5c6d64d6c7e589b4bb4548617
Treehugger Robot [Wed, 20 Feb 2019 11:14:24 +0000 (11:14 +0000)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal."
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:47:24 +0000 (21:47 -0800)]
Merge "Adding validate before switch feature." am:
f2cf09c945
am:
86ca0ba02f
Change-Id: Ib886edf8fc3d1fa1703adcc0f91e8dff606face0
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:38:21 +0000 (21:38 -0800)]
Merge "Adding validate before switch feature."
am:
f2cf09c945
Change-Id: Ie3f4429c1d7efefb83cf8289481a37adddd83801
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:25:00 +0000 (05:25 +0000)]
Merge "Adding validate before switch feature."
Tyler Gunn [Wed, 20 Feb 2019 05:07:09 +0000 (21:07 -0800)]
Merge "Add support for Telecom logging to obfuscate string phone numbers." am:
ae941732bb
am:
bfd852a7bb
Change-Id: Ib27221f30e053ea25d67cbb15625e402a58f6eda
Tyler Gunn [Wed, 20 Feb 2019 04:57:50 +0000 (20:57 -0800)]
Merge "Add support for Telecom logging to obfuscate string phone numbers."
am:
ae941732bb
Change-Id: I3ca1652cfd23ad3f94991c21e5072d4082cc20c8
Tyler Gunn [Wed, 20 Feb 2019 04:40:13 +0000 (04:40 +0000)]
Merge "Add support for Telecom logging to obfuscate string phone numbers."
Bill Yi [Wed, 20 Feb 2019 03:55:33 +0000 (19:55 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ae15ee43e4 -s ours
am skip reason: subject contains skip directive
Change-Id: I46dd20dbc70e30354ce0773181ef7e83d926ea35
Bill Yi [Wed, 20 Feb 2019 03:46:27 +0000 (19:46 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
aebba25f55 -s ours
am skip reason: subject contains skip directive
Change-Id: Icc4b14bb5da86880a5ad5a73314209c538db126d
TreeHugger Robot [Wed, 20 Feb 2019 03:45:28 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Wed, 20 Feb 2019 03:44:37 +0000 (19:44 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
60685350c6 -s ours
am skip reason: subject contains skip directive
Change-Id: I6971151c9547b8d8e1867a5732b2ab1c1bb7b9c3
Bill Yi [Wed, 20 Feb 2019 03:38:11 +0000 (19:38 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e6b0455e71 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic7e1612ccf2bef010ff52ce5fcfaed947f53588f
Bill Yi [Wed, 20 Feb 2019 03:36:30 +0000 (19:36 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
c691b7e52c -s ours
am skip reason: subject contains skip directive
Change-Id: I06fa6c98d7f69830fd3b1c46637990bccdb719d7
TreeHugger Robot [Wed, 20 Feb 2019 03:35:07 +0000 (03:35 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Wed, 20 Feb 2019 03:34:15 +0000 (19:34 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6670b2287a -s ours
am skip reason: subject contains skip directive
Change-Id: I64f1059af45b3e949ceadacb5fa3a6d0673cd850
Bill Yi [Wed, 20 Feb 2019 03:32:03 +0000 (19:32 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
85c48edc69 -s ours
am skip reason: subject contains skip directive
Change-Id: I959988458fa524fb31392d79c3e8dd7ec80d3da5
Bill Yi [Wed, 20 Feb 2019 03:30:27 +0000 (19:30 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
8dfcae263a -s ours
am skip reason: subject contains skip directive
Change-Id: I416874fe5e5440dc9a1a8fc89e84ab7f34638153
TreeHugger Robot [Wed, 20 Feb 2019 03:30:10 +0000 (03:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:27:17 +0000 (03:27 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Android Build Merger (Role) [Wed, 20 Feb 2019 03:25:43 +0000 (03:25 +0000)]
Merge "Merge "Move getPhoneCount implementation back to TelephonyManager." am:
7d6e085229 am:
2938bf23f7" into pi-dev-plus-aosp
TreeHugger Robot [Wed, 20 Feb 2019 03:25:36 +0000 (03:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:24:46 +0000 (03:24 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:24:18 +0000 (03:24 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 03:24:11 +0000 (19:24 -0800)]
Merge "Move getPhoneCount implementation back to TelephonyManager." am:
7d6e085229
am:
2938bf23f7
Change-Id: Id5d2e92feb2a40c8cd6cc3206d3b2a563abd4117
Bill Yi [Wed, 20 Feb 2019 03:23:59 +0000 (19:23 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6fe3e60d9a -s ours
am skip reason: subject contains skip directive
Change-Id: Ieb00cfb80ce0b53b1add48017ce5f448e8de8a37
TreeHugger Robot [Wed, 20 Feb 2019 03:23:28 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Wed, 20 Feb 2019 03:22:23 +0000 (19:22 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
b3581e7602 -s ours
am skip reason: subject contains skip directive
Change-Id: I09840927198a83c3c0b12729f47337fd223c2c3e
TreeHugger Robot [Wed, 20 Feb 2019 03:15:27 +0000 (03:15 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:14:37 +0000 (03:14 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 03:10:34 +0000 (19:10 -0800)]
Merge "Move getPhoneCount implementation back to TelephonyManager."
am:
7d6e085229
Change-Id: I5bca6f3d4db132fbf4a0086d38d57ccda53c2780
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 02:58:09 +0000 (02:58 +0000)]
Merge "Move getPhoneCount implementation back to TelephonyManager."
Malcolm Chen [Fri, 25 Jan 2019 00:33:51 +0000 (16:33 -0800)]
Adding validate before switch feature.
In CBRS DSDS mode, switching data to CBRS network will require
validation first. Adding a component of CellularNetworkValidator
to trigger the validation and pass the result back to PhoneSwitcher.
Bug:
118348832
Test: manual
Change-Id: I689aa494f031834b5cee76906922ebdafa9c77ed
Merged-In: I689aa494f031834b5cee76906922ebdafa9c77ed
Hall Liu [Wed, 20 Feb 2019 01:37:59 +0000 (17:37 -0800)]
Merge "Turn on enforcing mode for Q-based location APIs" am:
5bc4949f3f
am:
7407647336
Change-Id: I2392be3559a6bc2052e1ae7b5acfeb5e20ac1415
Shuo Qian [Wed, 20 Feb 2019 01:30:06 +0000 (17:30 -0800)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel" am:
9102b10a00
am:
bd50159ba9
Change-Id: I1b4523556c1457aa634dcaa579316ea4360698a1
Hall Liu [Wed, 20 Feb 2019 01:27:02 +0000 (17:27 -0800)]
Merge "Turn on enforcing mode for Q-based location APIs"
am:
5bc4949f3f
Change-Id: I5bbc816a59c8155a89109d8cc77dd4bd1536bd2a
Shuo Qian [Wed, 20 Feb 2019 01:22:07 +0000 (17:22 -0800)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"
am:
9102b10a00
Change-Id: I91088e4dda584b102409f4007b25f405d538464f
Hall Liu [Wed, 20 Feb 2019 01:08:04 +0000 (01:08 +0000)]
Merge "Turn on enforcing mode for Q-based location APIs"
Shuo Qian [Wed, 20 Feb 2019 01:08:03 +0000 (01:08 +0000)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"
Malcolm Chen [Thu, 31 Jan 2019 05:19:57 +0000 (21:19 -0800)]
Move getPhoneCount implementation back to TelephonyManager.
Moving it inside iTelephony creates problems. Some components call
getPhoneCount during initialization while iTelephony service is not
even running, which will cause phone process to crash.
Bug:
123667461
Test: manual
Change-Id: I51199eaf0bd87055c21fe61af50f4c353137d621
Merged-In: I51199eaf0bd87055c21fe61af50f4c353137d621
sqian [Thu, 14 Feb 2019 22:58:03 +0000 (14:58 -0800)]
Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel
Test: Treehugger
Bug:
123999640
Change-Id: Ie68a02a7e0f9aabe5dbc37806a495169feb63765
Merged-In: Ie68a02a7e0f9aabe5dbc37806a495169feb63765
(cherry picked from commit
0c86fbf491f4781ef3be68ba51aa3bfdb0bd7bc0)
Vishnu Nair [Tue, 19 Feb 2019 22:56:36 +0000 (14:56 -0800)]
Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev
am:
5a50cb42b7
Change-Id: I60169422c51d12b19bb24e997ec9a2a98fffa2ea
TreeHugger Robot [Tue, 19 Feb 2019 22:45:16 +0000 (22:45 +0000)]
Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev
Nataniel Borges [Tue, 19 Feb 2019 22:44:39 +0000 (14:44 -0800)]
[automerger skipped] Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys" am:
b829ad7b17 -s ours
am:
45233be2cb -s ours
am skip reason: subject contains skip directive
Change-Id: Id9ac53e323c1439bbd38746a03e4e00aaf4232bf
Bill Yi [Tue, 19 Feb 2019 22:40:06 +0000 (14:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I01b16b7e400b569350aad675ab5f75bd28dac24c
Nataniel Borges [Tue, 19 Feb 2019 22:36:36 +0000 (14:36 -0800)]
[automerger skipped] Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys"
am:
b829ad7b17 -s ours
am skip reason: subject contains skip directive
Change-Id: I71edd61462c4f7b276a207d7efca6a5f82bb0a3e
Raman Tenneti [Tue, 19 Feb 2019 22:29:21 +0000 (14:29 -0800)]
[automerger skipped] Merge "Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev" into stage-aosp-master
am:
bfddb8cce7 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: Ib8ae69eb4c74e0bb29639424218d405a598a5ae8
Treehugger Robot [Tue, 19 Feb 2019 22:21:05 +0000 (22:21 +0000)]
Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys"
TreeHugger Robot [Tue, 19 Feb 2019 22:13:43 +0000 (22:13 +0000)]
Merge "Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev" into stage-aosp-master
Bill Yi [Tue, 19 Feb 2019 22:05:27 +0000 (14:05 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ieee5c947030f588c5f8a8a153e2c42661342d60f
Bill Yi [Tue, 19 Feb 2019 21:31:17 +0000 (13:31 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idb5d5034ebd53ffc67f8628b74be7a53f58aa7d3
Dmitry Dementyev [Tue, 19 Feb 2019 21:02:10 +0000 (13:02 -0800)]
Merge "Lazely initialize AccountManager debug table." am:
18cccec624
am:
90aea59364
Change-Id: Ic08bc5f91ef153ddd28533a638ccca33cd408553
Bill Yi [Tue, 19 Feb 2019 20:56:46 +0000 (12:56 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6743c980549e1620354ea082664333e8612c28e0
Dmitry Dementyev [Tue, 19 Feb 2019 20:23:26 +0000 (12:23 -0800)]
Merge "Lazely initialize AccountManager debug table."
am:
18cccec624
Change-Id: If7e12145dfa8e104777956bdab9a743f3f860e24
Bill Yi [Tue, 19 Feb 2019 20:22:45 +0000 (12:22 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6db2d08a67d01afeb8d22beaaf24d7548b88fdda
Bill Yi [Tue, 19 Feb 2019 20:07:54 +0000 (12:07 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I16612db31b21037fb7f56d8b34d84df0c7e37cf1
Dmitry Dementyev [Tue, 19 Feb 2019 19:49:13 +0000 (19:49 +0000)]
Merge "Lazely initialize AccountManager debug table."
Bill Yi [Tue, 19 Feb 2019 19:32:44 +0000 (11:32 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ieb2802240cd7e1f91014579d3367d9f6bf2d152c
Raman Tenneti [Wed, 6 Feb 2019 00:34:43 +0000 (16:34 -0800)]
Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
On 9/28 CL https://googleplex-android-review.git.corp.google.com/
5116913 was checked into pi-dev. Merge was bad(couple of lines were lost during merge).
https://b.corp.google.com/issues/
35655737#comment34
Adding LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS and LOCK_SCREEN_SHOW_NOTIFICATIONS to SETTINGS_TO_BACKUP array. This fixes apct/framework/presubmit test failure.
Bug:
35655737
Bug:
118674794
Test: presubmit unit tests
Change-Id: I2e9cc95e8827e72ef3c09910d4d3e089bde375e5
Merged-In: I421c7487955ee339f88e3957c973375d0f87e2ff
(cherry picked from commit
33a11bd0e3c29937af311bc55bbbe36ee63608f4)
Bill Yi [Tue, 19 Feb 2019 18:58:10 +0000 (10:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3d9dd70565d27f7af23d3828508e4d44f840e91d
Sasha Smundak [Tue, 19 Feb 2019 18:46:30 +0000 (10:46 -0800)]
Merge "Convert Android.mk file to Android.bp" am:
a81d64e940
am:
efa1d26538
Change-Id: I8e82717e35d5d569a2a91fb609726537733d1aba
Sasha Smundak [Tue, 19 Feb 2019 18:32:16 +0000 (10:32 -0800)]
Merge "Convert Android.mk file to Android.bp"
am:
a81d64e940
Change-Id: I8202195e94c616d8b09e76aa01f4d74f098afd3e
Bill Yi [Tue, 19 Feb 2019 18:23:58 +0000 (10:23 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0286c19387a614103c795956a2f6b4e672ff4133
Treehugger Robot [Tue, 19 Feb 2019 18:18:40 +0000 (18:18 +0000)]
Merge "Convert Android.mk file to Android.bp"
Beverly [Tue, 19 Feb 2019 18:16:32 +0000 (10:16 -0800)]
Merge "Update keyguard charging text to indicate wireless" into pi-dev
am:
06cfb175bd
Change-Id: Ia474165d912c2090f4756108124c8a0333b31e6b
TreeHugger Robot [Tue, 19 Feb 2019 18:02:30 +0000 (18:02 +0000)]
Merge "Update keyguard charging text to indicate wireless" into pi-dev
Dario Freni [Tue, 19 Feb 2019 16:09:44 +0000 (08:09 -0800)]
Merge "Add dariofreni to APEX-related files owners." am:
9d805ba071
am:
c423836b08
Change-Id: I758e913f07aba1462375a7239ca6daadb81c3657
Dario Freni [Tue, 19 Feb 2019 15:54:42 +0000 (07:54 -0800)]
Merge "Add dariofreni to APEX-related files owners."
am:
9d805ba071
Change-Id: I13e6dda30f6aeaab8654758cd55a0166b019507c
Dario Freni [Tue, 19 Feb 2019 15:43:35 +0000 (15:43 +0000)]
Merge "Add dariofreni to APEX-related files owners."
Nicolas Geoffray [Tue, 19 Feb 2019 14:53:30 +0000 (06:53 -0800)]
Merge "Add a dalvik.vm.boot-image option for zygote and installd." am:
80e697a297
am:
f2bcd619a1
Change-Id: If5c1bbd614f5c3758f636f6a30ac93e0b64bb01d
Nicolas Geoffray [Tue, 19 Feb 2019 14:44:44 +0000 (06:44 -0800)]
Merge "Add a dalvik.vm.boot-image option for zygote and installd."
am:
80e697a297
Change-Id: Icbdf60640f0a1b5995ad09eba0bee6ed81b50c4a
Nicolas Geoffray [Tue, 19 Feb 2019 14:28:18 +0000 (14:28 +0000)]
Merge "Add a dalvik.vm.boot-image option for zygote and installd."
Dario Freni [Mon, 18 Feb 2019 17:53:24 +0000 (17:53 +0000)]
Add dariofreni to APEX-related files owners.
Test: n/a
Change-Id: I3a26033f52d98e5edcde852fff007ba33ae90856
Adam Vartanian [Tue, 19 Feb 2019 09:54:53 +0000 (01:54 -0800)]
Merge "Fix authority parsing test" am:
8ce3609e58
am:
becdd58df5
Change-Id: I41d4997661cf011e9589aedac9de301b1becb441
Adam Vartanian [Tue, 19 Feb 2019 09:44:45 +0000 (01:44 -0800)]
Merge "Fix authority parsing test"
am:
8ce3609e58
Change-Id: I8554fddceb326c52b85b34a483b3e3791abf2cdc
Adam Vartanian [Tue, 19 Feb 2019 09:27:35 +0000 (09:27 +0000)]
Merge "Fix authority parsing test"
Adam Vartanian [Mon, 18 Feb 2019 12:01:11 +0000 (12:01 +0000)]
Fix authority parsing test
The test has been failing because http://r.android.com/793302 changed
how the port separator was found, only scanning ASCII digits until it
hits a colon, and previously it would scan for the colon and then
percent-decode the rest of it. The new behavior actually better
matches the WHATWG URL parsing algorithm [1], which specifies that
ports only include ASCII digits. It does mean that some edge cases
that previously parsed as host "foo", port 42 will now parse as
host "foo:42", no port, but those URLs wouldn't be accepted by
browsers so they should be exceedingly rare.
The behavior per the WHATWG spec would be to fail to parse in the case
of a percent-encoded character in the port section, but this class is
specifically documented to accept garbage, so lumping the mis-encoded
port as part of the hostname (which will result in a hostname that's
invalid and impossible to resolve) seems like the best option.
[1] https://url.spec.whatwg.org/#port-state
Fixes:
124360078
Test: atest android.net.UriTest
Change-Id: I1c788cb7703c821ae74b542b74d89e10cba5a546
Raj Mamadgi [Tue, 19 Feb 2019 02:22:41 +0000 (18:22 -0800)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch" am:
43d11758fa
am:
0f174795e4
Change-Id: Ie32376993dcc8b06f3d2254d6aecdb9a4f843236
Raj Mamadgi [Tue, 19 Feb 2019 02:13:45 +0000 (18:13 -0800)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
am:
43d11758fa
Change-Id: I6b248297523070983c63b5dd870e235eea5ee59c
Treehugger Robot [Tue, 19 Feb 2019 02:02:35 +0000 (02:02 +0000)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
Bill Yi [Mon, 18 Feb 2019 19:58:21 +0000 (11:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iac677129e3b4f27cb4db6bf5ce21d921a9f45116
David Brazdil [Mon, 18 Feb 2019 19:29:01 +0000 (11:29 -0800)]
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()" am:
da75e38817
am:
20a71e4a90
Change-Id: I07d5ec63ffcf5bda0a2cb3c2d4b0d3af0d3fdbf3
David Brazdil [Mon, 18 Feb 2019 19:18:40 +0000 (11:18 -0800)]
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()"
am:
da75e38817
Change-Id: I50ac78d0e85ab34cea2abaef4f44ee8d418e517c
Treehugger Robot [Mon, 18 Feb 2019 19:11:00 +0000 (19:11 +0000)]
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()"
Jakub Gielzak [Mon, 18 Feb 2019 18:42:20 +0000 (10:42 -0800)]
Merge "Revert "Remove legacy-test and legacy-android-test targets"" am:
049c1589ee
am:
7f997d4cfc
Change-Id: If998990b94bd36f0ffae26dede85df8ad079093e
Jakub Gielzak [Mon, 18 Feb 2019 18:32:40 +0000 (10:32 -0800)]
Merge "Revert "Remove legacy-test and legacy-android-test targets""
am:
049c1589ee
Change-Id: Ia84907bfa038954256bc791490a490dd338b33ce
Anton Hansson [Mon, 18 Feb 2019 18:26:05 +0000 (10:26 -0800)]
Merge "Specify no resource_dirs for SystemUI" am:
347d6ff9f9
am:
a05d598bc0
Change-Id: I2f2fd095a77726c62ea7f557a7ed3b5844691bf5
Jakub Gielzak [Mon, 18 Feb 2019 18:24:58 +0000 (18:24 +0000)]
Merge "Revert "Remove legacy-test and legacy-android-test targets""
Jakub Gielzak [Mon, 18 Feb 2019 18:24:17 +0000 (18:24 +0000)]
Revert "Remove legacy-test and legacy-android-test targets"
This reverts commit
3b0be60307cc6063795f8cd32356745ee371e757.
Reason for revert: Broken build
Change-Id: I71270c7b47163ab7147029f2d3961d1848fdd9eb
Anton Hansson [Mon, 18 Feb 2019 18:16:37 +0000 (10:16 -0800)]
Merge "Specify no resource_dirs for SystemUI"
am:
347d6ff9f9
Change-Id: I0b752a641e5f74d7dac1017616553f464427e219
Anton Hansson [Mon, 18 Feb 2019 18:03:36 +0000 (18:03 +0000)]
Merge "Specify no resource_dirs for SystemUI"
Paul Duffin [Mon, 18 Feb 2019 15:35:37 +0000 (07:35 -0800)]
Merge "Remove legacy-test and legacy-android-test targets" am:
14daedf747
am:
4a83feb18a
Change-Id: I920fe03eb41e0aceab8ba794bdfd53d3a5c75388
Paul Duffin [Mon, 18 Feb 2019 15:26:09 +0000 (07:26 -0800)]
Merge "Remove legacy-test and legacy-android-test targets"
am:
14daedf747
Change-Id: I67e3a6d58324affcb9119002d4fb2be23e3121fc
Jin Seok Park [Mon, 18 Feb 2019 15:15:59 +0000 (07:15 -0800)]
Merge "Add OWNERS for ExifInterface" am:
996d37ea59
am:
3250d90912
Change-Id: I96a63075aca417d269e941a84612c72575c073fd
Paul Duffin [Mon, 18 Feb 2019 15:13:45 +0000 (15:13 +0000)]
Merge "Remove legacy-test and legacy-android-test targets"
Jin Seok Park [Mon, 18 Feb 2019 15:06:53 +0000 (07:06 -0800)]
Merge "Add OWNERS for ExifInterface"
am:
996d37ea59
Change-Id: I24669310bf259344675110b2e4463894843e776b
David Brazdil [Mon, 18 Feb 2019 14:59:20 +0000 (14:59 +0000)]
Force blacklist on VMRuntime.setTargetSdkVersion*()
The methods could be used to bypass the restrictions. Force them
onto the blacklist.
Test: builds
Change-Id: I77d1fb8ca7339bec5e933f87a3b672096e2e559e
Jin Seok Park [Mon, 18 Feb 2019 14:56:06 +0000 (14:56 +0000)]
Merge "Add OWNERS for ExifInterface"
Anton Hansson [Fri, 8 Feb 2019 09:01:32 +0000 (09:01 +0000)]
Specify no resource_dirs for SystemUI
The res directory is already included via the SystemUI-core
library. The default for resource_dirs is ["res"] if it exists,
so explicitly clear it to avoid depending on it twice.
Bug:
124035856
Test: m SystemUI
Change-Id: Ia1b06cd9eff4e614684efde34288cf9ebd895870
OSDN Git Service
