OSDN Git Service
Paul Mclean [Fri, 11 May 2018 20:52:44 +0000 (20:52 +0000)]
Merge "Moving native MIDI JNI init to AndroidRuntime.cpp."
fionaxu [Fri, 11 May 2018 20:49:39 +0000 (13:49 -0700)]
[automerger skipped] Merge "add install action for carrier id to system API" am:
87a7c657bd am:
2bbb36cb4f -s ours
am:
50b2c1ae6e -s ours
Change-Id: Ia361c2ece6e47918697e4b3d54225ae62f4cba30
Abodunrinwa Toki [Fri, 11 May 2018 20:40:26 +0000 (13:40 -0700)]
Merge "Fix TextClassifier logging." into pi-dev am:
1c60953f9d
am:
c2aa28895a
Change-Id: Ia7efff7e3505053b21e4e7c6f55cc2394024f318
TreeHugger Robot [Fri, 11 May 2018 19:56:27 +0000 (19:56 +0000)]
Merge "IWYU for SkUnPreMultiply"
Chad Brubaker [Fri, 11 May 2018 19:42:44 +0000 (12:42 -0700)]
Merge "Fall back to checking packages if one is not provided" into pi-dev am:
9d976db861
am:
5f51d45334
Change-Id: I02502c178e41e23c1d11bc59df8e6bba6242ed4d
Michael Dooley [Fri, 11 May 2018 19:32:58 +0000 (12:32 -0700)]
Merge "Don't crash if SoundTriggerDetectionService client is gone or if there is a remote exception while finishing an opperation" into pi-dev am:
74b6863504
am:
ce408cbce7
Change-Id: Ibb990f69745fd90b9d8a9739cc57b41cc5b87e17
TreeHugger Robot [Fri, 11 May 2018 19:24:28 +0000 (19:24 +0000)]
Merge "Suppress InputDevices validation logs"
fionaxu [Fri, 11 May 2018 19:01:25 +0000 (12:01 -0700)]
[automerger skipped] Merge "add install action for carrier id to system API" am:
87a7c657bd
am:
2bbb36cb4f -s ours
Change-Id: I80aa691e0d45a27e1342ab8f41e4fc6de0471be6
Todd Kennedy [Fri, 11 May 2018 18:59:39 +0000 (11:59 -0700)]
Merge changes from topic "b_78809704" into pi-dev am:
92b64bb1bb
am:
f08b40642a
Change-Id: I2e71d83df38b87e2379b6d0bbc2a09cfe6bed4bc
Mrten Kongstad [Fri, 11 May 2018 18:55:48 +0000 (11:55 -0700)]
OMS: rebase settings when overlays update am:
2f1944bf0e
am:
0ddacd34de
Change-Id: I7efbcefacbb1d8c7811587889382386fe1513cc8
Abodunrinwa Toki [Fri, 11 May 2018 18:54:47 +0000 (11:54 -0700)]
Merge "Fix TextClassifier logging." into pi-dev
am:
1c60953f9d
Change-Id: I51ade4a3ac7a75bef258faf487a279310fe1e2fb
fionaxu [Fri, 11 May 2018 18:52:27 +0000 (11:52 -0700)]
Merge "add install action for carrier id to system API"
am:
87a7c657bd
Change-Id: I5a3534bc791b44be092bfae2c07b2415886e4ed8
Bryce Lee [Fri, 11 May 2018 18:50:37 +0000 (11:50 -0700)]
Merge "Don't allow non-showOnLock activity to be next on finish." into pi-dev am:
92a339736f
am:
356759d659
Change-Id: I83d249a1a6f56d95e53179ae030449827aedf44c
Ondrej Novak [Fri, 11 May 2018 18:43:52 +0000 (18:43 +0000)]
Merge "Register fallback even if background already exists"
Ondrej Novak [Thu, 10 May 2018 14:00:01 +0000 (16:00 +0200)]
Register fallback even if background already exists
Fallback would not be registered/drawn if background was explicitly set before calling
setContentView and the area that was supposed to be covered by fallback ended up black.
mBackgroundDrawable does not control fallback, so setting fallback should not be dependent on
it's existence.
Change-Id: I7da85e8c61dababa3a7ce930238ea0f283d19b32
Fixes:
68822553
Test: atest PhoneWindowTest
Chad Brubaker [Fri, 11 May 2018 18:35:58 +0000 (11:35 -0700)]
Merge "Fall back to checking packages if one is not provided" into pi-dev
am:
9d976db861
Change-Id: I65a63b959368549f58be7318a26e8dfa310120ff
TreeHugger Robot [Fri, 11 May 2018 18:29:31 +0000 (18:29 +0000)]
Merge "Fix TextClassifier logging." into pi-dev
Michael Dooley [Fri, 11 May 2018 18:29:19 +0000 (11:29 -0700)]
Merge "Don't crash if SoundTriggerDetectionService client is gone or if there is a remote exception while finishing an opperation" into pi-dev
am:
74b6863504
Change-Id: I5b95c04240b85b2358c8e120a563a4d6a3bb9ce6
Dieter Hsu [Fri, 11 May 2018 18:28:25 +0000 (11:28 -0700)]
Merge "Fix active permission touch target too small" into pi-dev am:
bb668a2bb7
am:
62a0d4f32e
Change-Id: I7c08226c9984d5b3d306cba1eb2df047764dab8f
Lucas Dupin [Fri, 11 May 2018 18:15:50 +0000 (11:15 -0700)]
Merge "Do not hide keyguard message when fp" into pi-dev am:
2d2d79b92c
am:
24ef8f99ab
Change-Id: I86ae14bd8fd0f6c47dacca95163b38e6f741e18c
Todd Kennedy [Fri, 11 May 2018 18:15:10 +0000 (11:15 -0700)]
Merge changes from topic "b_78809704" into pi-dev
am:
92b64bb1bb
Change-Id: I08a9b59d00c9e7aa075c21c44b582d571fe79fd7
Chad Brubaker [Fri, 11 May 2018 18:13:35 +0000 (18:13 +0000)]
Merge "Fall back to checking packages if one is not provided" into pi-dev
Jason Monk [Fri, 11 May 2018 18:10:30 +0000 (11:10 -0700)]
Merge "Allow onGetSliceDescendants to be slow" into pi-dev am:
02b9592ff1
am:
16db9b96bf
Change-Id: If7f7479a3f56baaa5fc49036c0b0ee973e18dccc
Mrten Kongstad [Fri, 11 May 2018 18:09:25 +0000 (11:09 -0700)]
OMS: rebase settings when overlays update
am:
2f1944bf0e
Change-Id: I1691fa4251182adf9484cafb12484aa8003cbf3c
Patrick Baumann [Fri, 11 May 2018 18:05:16 +0000 (11:05 -0700)]
Merge "Support generic filters when EXTERNAL flag is set" into pi-dev am:
78f939b40f
am:
8bbf6a4eab
Change-Id: Id1ab0da7ba189fbd10391e52c638549b89c3f079
Bryce Lee [Fri, 11 May 2018 18:03:50 +0000 (11:03 -0700)]
Merge "Don't allow non-showOnLock activity to be next on finish." into pi-dev
am:
92a339736f
Change-Id: If57b94767fc0bc90cae715967c42fb7d1a8cbba3
Jordan Liu [Fri, 11 May 2018 17:58:29 +0000 (10:58 -0700)]
[automerger skipped] Merge "Add Carriers.APN_SET_ID and NO_SET_SET" am:
cdb29f97db am:
87a0844d12 -s ours
am:
e9a3356c31 -s ours
Change-Id: I00f345b9f69d47a7dd8f33326bdd50bf4d1d75e3
Dieter Hsu [Fri, 11 May 2018 17:57:49 +0000 (10:57 -0700)]
Merge "Fix active permission touch target too small" into pi-dev
am:
bb668a2bb7
Change-Id: I92aa46fd58e565a40ae7ccb52b76e9567cced2a9
Michael Dooley [Fri, 11 May 2018 17:46:41 +0000 (17:46 +0000)]
Merge "Don't crash if SoundTriggerDetectionService client is gone or if there is a remote exception while finishing an opperation" into pi-dev
Lucas Dupin [Fri, 11 May 2018 17:46:21 +0000 (10:46 -0700)]
Merge "Do not hide keyguard message when fp" into pi-dev
am:
2d2d79b92c
Change-Id: I87caaa3377f1146a7bf4b0737463152ab3db2f20
Todd Kennedy [Fri, 11 May 2018 17:44:53 +0000 (17:44 +0000)]
Merge changes from topic "b_78809704" into pi-dev
* changes:
OMS: teach the OMS about static RROs
OMS: rebase settings when overlays update
TreeHugger Robot [Fri, 11 May 2018 17:39:36 +0000 (17:39 +0000)]
Merge "Don't allow non-showOnLock activity to be next on finish." into pi-dev
Jason Monk [Fri, 11 May 2018 17:37:59 +0000 (10:37 -0700)]
Merge "Allow onGetSliceDescendants to be slow" into pi-dev
am:
02b9592ff1
Change-Id: I91899f01fd769c313e62000eee277ab3242099f0
Dieter Hsu [Fri, 11 May 2018 17:37:35 +0000 (17:37 +0000)]
Merge "Fix active permission touch target too small" into pi-dev
Treehugger Robot [Fri, 11 May 2018 17:36:24 +0000 (17:36 +0000)]
Merge "add install action for carrier id to system API"
Patrick Baumann [Fri, 11 May 2018 17:33:20 +0000 (10:33 -0700)]
Merge "Support generic filters when EXTERNAL flag is set" into pi-dev
am:
78f939b40f
Change-Id: I8cd917b0a43ec06032c0496e714e1b213e563167
TreeHugger Robot [Fri, 11 May 2018 17:31:24 +0000 (17:31 +0000)]
Merge "Do not hide keyguard message when fp" into pi-dev
Jordan Liu [Fri, 11 May 2018 17:29:53 +0000 (10:29 -0700)]
[automerger skipped] Merge "Add Carriers.APN_SET_ID and NO_SET_SET" am:
cdb29f97db
am:
87a0844d12 -s ours
Change-Id: I4e67d7d71d1eb8dda13a4f25e505f4b8708f3afd
TreeHugger Robot [Fri, 11 May 2018 17:21:28 +0000 (17:21 +0000)]
Merge "Allow onGetSliceDescendants to be slow" into pi-dev
Siarhei Vishniakou [Fri, 11 May 2018 17:20:05 +0000 (10:20 -0700)]
Suppress InputDevices validation logs
When the .kcm files are getting validated, there is logspam in the build
output, produced even when there aren't any errors. Add the "-q" option
to validate command to quiet these logs.
Test: $ rm -rf out/target/common/obj/ETC/validate_input_devices_keymaps_intermediates/
$ m. Note: just doing "m sync" or "m InputDevices" is not sufficient to
test this.
Bug:
35672363
Change-Id: Ib0213de7ee0fe965f1a202afdb718a2221017e06
Leon Scroggins III [Fri, 11 May 2018 17:19:37 +0000 (13:19 -0400)]
IWYU for SkUnPreMultiply
Test: build
The Skia to Android master roll is due to not being able to find
SkUnPreMultiply. It must have been included transitively previously.
Include it directly to ensure it's defined.
Change-Id: I9eedce274f5329641a7ebcd65979f10861f17cb0
TreeHugger Robot [Fri, 11 May 2018 17:16:37 +0000 (17:16 +0000)]
Merge "Support generic filters when EXTERNAL flag is set" into pi-dev
Bo Zhu [Fri, 11 May 2018 17:08:47 +0000 (10:08 -0700)]
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev am:
90dbb0ed72
am:
542dbb9734
Change-Id: I953c5cf4f2475dc0d371e4b3fb3f9ad7520c60ad
Chad Brubaker [Wed, 9 May 2018 21:05:57 +0000 (14:05 -0700)]
Fall back to checking packages if one is not provided
Test: atest GsmCdmaPhoneTest.java
Change-Id: I81df49fd2f751ce28d834fc5d9cd254623930770
Fixes:
75450505
Jordan Liu [Fri, 11 May 2018 17:04:19 +0000 (10:04 -0700)]
Merge "Add Carriers.APN_SET_ID and NO_SET_SET"
am:
cdb29f97db
Change-Id: I6b004476c47e105b35ec0d3884c660f6b10b8697
Bo Zhu [Fri, 11 May 2018 16:59:59 +0000 (09:59 -0700)]
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev
am:
90dbb0ed72
Change-Id: I96ddaa531db00ec6e925b276e5ba137af51bfed5
Riddle Hsu [Fri, 11 May 2018 16:59:38 +0000 (09:59 -0700)]
Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev am:
eacc2163d3
am:
fb9bfe3fdc
Change-Id: Ie2fa660ad8b350c5a46dc40d66e5ffbfe8e3d2bf
Riddle Hsu [Fri, 11 May 2018 16:50:20 +0000 (09:50 -0700)]
Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev
am:
eacc2163d3
Change-Id: If4e5a875e57edfecb574c7137446b87b44718001
Bo Zhu [Fri, 11 May 2018 16:46:16 +0000 (16:46 +0000)]
Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev
Riddle Hsu [Fri, 11 May 2018 16:36:29 +0000 (16:36 +0000)]
Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev
John Reck [Fri, 11 May 2018 16:32:59 +0000 (16:32 +0000)]
Merge "A better HW Bitmap uploader"
Lucas Dupin [Thu, 10 May 2018 22:31:20 +0000 (15:31 -0700)]
Do not hide keyguard message when fp
Test: atest packages/SystemUI/tests/src/com/android/keyguard/KeyguardPinBasedInputViewTest.java
Change-Id: I5d76b688b0eb7c1df6a36c1cb910f2b0ec98bc46
Fixes:
78235570
Paul McLean [Wed, 9 May 2018 16:03:57 +0000 (10:03 -0600)]
Moving native MIDI JNI init to AndroidRuntime.cpp.
Remove (non-working) lazy init in midi.cpp
Bug:
79464070
Test: Verify function with NativeMidiTestbed app.
Change-Id: I30182d19d205b4ab952d622824f1a63ab1fef72e
Mathew Inwood [Fri, 11 May 2018 16:07:24 +0000 (09:07 -0700)]
Merge "Add APIs from public requests." into pi-dev am:
7692904a7b
am:
2b46441438
Change-Id: I4146edfc20788e3403f7582d7c31c8dccd837058
Patrick Baumann [Thu, 3 May 2018 20:16:01 +0000 (13:16 -0700)]
Support generic filters when EXTERNAL flag is set
This change opts instant app resolution out of hash prefix matching if
the intent filter being tested does not define an authority only when
the MATCH_EXTERNAL flag is set. This allows for a class of instant apps
that generically handle certain mime types or actions, but aren't tied
to a particular authority / domain.
This also moves the null check for resolution to a higher level,
accounting for connection-related failures to ensure that the installer
always gets a properly formatted intent.
Bug:
63117034
Test: manual - force connection timeouts and observe correct install intent
Test: manual - launch a generic type handler for a made up mime type;
observe correct resolution
Test: atest EphemeralTest
Change-Id: I0101e3219f543897a488ddd3d7c4c884f7d6cac3
Mathew Inwood [Fri, 11 May 2018 15:58:18 +0000 (08:58 -0700)]
Merge "Add APIs from public requests." into pi-dev
am:
7692904a7b
Change-Id: I0eff161e25938a9bb823f730a9c208b94ac2dbac
Jordan Liu [Fri, 11 May 2018 15:57:16 +0000 (15:57 +0000)]
Merge "Add Carriers.APN_SET_ID and NO_SET_SET"
fionaxu [Tue, 8 May 2018 18:57:53 +0000 (11:57 -0700)]
add install action for carrier id to system API
Bug:
79426800
Test: Manual
Change-Id: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
(cherry picked from commit
2776ed56b846ff34e45467f7618a679049d16f3f)
Merged-in: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
Mathew Inwood [Fri, 11 May 2018 15:44:53 +0000 (15:44 +0000)]
Merge "Add APIs from public requests." into pi-dev
Ryan Mitchell [Fri, 11 May 2018 15:41:00 +0000 (08:41 -0700)]
Merge "AAPT2: Insert platformBuild information" into pi-dev am:
91d2f87d0e
am:
78e0e6aa2e
Change-Id: I6fb1af5b521c5a887ee494c745b83592e48228de
David Brazdil [Fri, 11 May 2018 15:34:18 +0000 (08:34 -0700)]
Merge "Include in hidden API dark greylist based on package name" into pi-dev am:
f36144f575
am:
bad3bf6c22
Change-Id: I812fd5913e65f8573dad636251c6c217c6c1883f
Ryan Mitchell [Fri, 11 May 2018 15:30:35 +0000 (08:30 -0700)]
Merge "AAPT2: Insert platformBuild information" into pi-dev
am:
91d2f87d0e
Change-Id: Ifa673f17cb3ee1ecb146aaafab7c3c71b47f7154
David Brazdil [Fri, 11 May 2018 15:24:12 +0000 (08:24 -0700)]
Merge "Include in hidden API dark greylist based on package name" into pi-dev
am:
f36144f575
Change-Id: I2f1e1ccd9de49b95f1c5439b13134cc166645612
Jason Monk [Fri, 11 May 2018 15:23:59 +0000 (08:23 -0700)]
Allow onGetSliceDescendants to be slow
Because sometimes it needs to be
Test: existing tests
Bug:
79132845
Bug:
77873463
Change-Id: I93aa8553c48c856bf96c347a229be6e770751708
Ryan Mitchell [Fri, 11 May 2018 15:18:56 +0000 (15:18 +0000)]
Merge "AAPT2: Insert platformBuild information" into pi-dev
David Brazdil [Fri, 11 May 2018 15:11:23 +0000 (15:11 +0000)]
Merge "Include in hidden API dark greylist based on package name" into pi-dev
Jason Monk [Fri, 11 May 2018 14:58:57 +0000 (07:58 -0700)]
Merge "Make sure KeyguardUpdateMonitor uses main thread" into pi-dev am:
accef3e1f5
am:
0e8fcd37c5
Change-Id: I1d1be76718c482454887c07c5232a61bba70e888
Jason Monk [Fri, 11 May 2018 14:49:30 +0000 (07:49 -0700)]
Merge "Make sure KeyguardUpdateMonitor uses main thread" into pi-dev
am:
accef3e1f5
Change-Id: I033977dcdf4668c63eb2cbee88973a5306643dfe
TreeHugger Robot [Fri, 11 May 2018 14:39:29 +0000 (14:39 +0000)]
Merge "Make sure KeyguardUpdateMonitor uses main thread" into pi-dev
Kenny Guy [Fri, 11 May 2018 14:39:03 +0000 (07:39 -0700)]
Merge "Fix issue with compressed smart replies." into pi-dev am:
895ed11d03
am:
97511bc250
Change-Id: I040c40c8cc715065d880e41182ad9d2e931ab350
Mathew Inwood [Fri, 11 May 2018 14:04:36 +0000 (15:04 +0100)]
Add APIs from public requests.
Bug:
79477176
Bug:
79461371
Bug:
75254051
Bug:
77840247
Bug:
78456545
Test: m
Change-Id: I6588b65d4f4dccd5fe8bd8420b88c7830803c978
Kenny Guy [Fri, 11 May 2018 14:29:30 +0000 (07:29 -0700)]
Merge "Fix issue with compressed smart replies." into pi-dev
am:
895ed11d03
Change-Id: I7743b004a7ddc9e46f3366f7c15058aad12686c4
TreeHugger Robot [Fri, 11 May 2018 14:19:40 +0000 (14:19 +0000)]
Merge "Fix issue with compressed smart replies." into pi-dev
Evan Laird [Fri, 11 May 2018 14:15:48 +0000 (07:15 -0700)]
Merge "Battery saver color changes" into pi-dev am:
4ee9b14c14
am:
9252fbc726
Change-Id: Icd329e55bf491a71b08e337f7c50a5188788ee13
Nicolas Geoffray [Fri, 11 May 2018 14:08:02 +0000 (07:08 -0700)]
[automerger skipped] Merge "Add static analysis data." am:
1c5811d34d am:
bf9db89c75 -s ours
am:
050b4a4851 -s ours
Change-Id: If77451ef2f90dec5c371601bded3acaa422bc580
Evan Laird [Fri, 11 May 2018 14:02:22 +0000 (07:02 -0700)]
Merge "Battery saver color changes" into pi-dev
am:
4ee9b14c14
Change-Id: I10401ad57f32066b961ba8a7fe9d33cab9bff93b
Nicolas Geoffray [Fri, 11 May 2018 13:56:09 +0000 (06:56 -0700)]
[automerger skipped] Merge "Add static analysis data." am:
1c5811d34d
am:
bf9db89c75 -s ours
Change-Id: I3fdd8228ff12186ae035a3f3e38d99b507751b5d
TreeHugger Robot [Fri, 11 May 2018 13:48:43 +0000 (13:48 +0000)]
Merge "Battery saver color changes" into pi-dev
Nicolas Geoffray [Fri, 11 May 2018 13:44:05 +0000 (06:44 -0700)]
Fix pi-dev-plus-aosp breakage.
am:
7ae03babc6
Change-Id: I751f445b3ffd37c92cc83ca21e2e5f680c790551
Nicolas Geoffray [Fri, 11 May 2018 13:23:12 +0000 (14:23 +0100)]
Fix pi-dev-plus-aosp breakage.
bug:
64382372
Test: m
Change-Id: I9ca81e8e8aae96f5f55931c8393316c6f0f71157
Nicolas Geoffray [Fri, 11 May 2018 12:49:06 +0000 (05:49 -0700)]
Merge "Add static analysis data."
am:
1c5811d34d
Change-Id: I0e648c528b0e8749ecd1ee22e0d156354750427b
Suprabh Shukla [Fri, 11 May 2018 12:47:02 +0000 (05:47 -0700)]
Merge "Changed interceptor dialog text for suspended apps" into pi-dev am:
6982d3ee2a
am:
e99e98478e
Change-Id: I487bf73c572c8fa0e7481bbc701d27534ec17a77
Nicolas Geoffray [Fri, 11 May 2018 12:37:21 +0000 (05:37 -0700)]
[automerger skipped] Revert "Revert "Add static analysis data."" am:
d6c8144043
am:
3d77341d88 -s ours
Change-Id: Ia8d543bb677c1459e9735902127685f8740528f5
Suprabh Shukla [Fri, 11 May 2018 12:34:16 +0000 (05:34 -0700)]
Merge "Changed interceptor dialog text for suspended apps" into pi-dev
am:
6982d3ee2a
Change-Id: I4fc2d5bd6ebec345dc42bdee4b83c0f12d25a95d
Nicolas Geoffray [Fri, 11 May 2018 12:29:34 +0000 (05:29 -0700)]
Revert "Revert "Add static analysis data.""
am:
d6c8144043
Change-Id: I5114959573deaa6e4e5812ce7dab6f975d0279e5
David Brazdil [Thu, 10 May 2018 14:50:02 +0000 (15:50 +0100)]
Include in hidden API dark greylist based on package name
Dark greylist has so far been populated with the remaining class
members of classes listed on the light greylist. This patch changes
the rule to include all remaining classes and class members in the
same package (sub-packages not included).
Bug:
64382372
Test: make -j64 out/target/common/obj/PACKAGING/hiddenapi-dark-greylist.txt
Change-Id: Icf3f60f1e776f092103c612fc3995ce0e66617ea
TreeHugger Robot [Fri, 11 May 2018 12:21:39 +0000 (12:21 +0000)]
Merge "Changed interceptor dialog text for suspended apps" into pi-dev
Treehugger Robot [Fri, 11 May 2018 11:41:40 +0000 (11:41 +0000)]
Merge "Add static analysis data."
Dieter Hsu [Thu, 10 May 2018 12:07:52 +0000 (20:07 +0800)]
Fix active permission touch target too small
- Set buttons non-clickable to not consume events
- Add a11y contentDescription for active permissions buttons
Bug:
78198386
Test: manually receive messenger video call and verify touch targets
Test: manually record screen and verify with talkback/keyboard
Change-Id: I1b53cd1d7a88e44bd6e188b1055c8572c9d5731d
Nicolas Geoffray [Fri, 11 May 2018 10:38:58 +0000 (03:38 -0700)]
Merge "Move registration of AssetManager.mObject to zygote." into pi-dev am:
85ec63532f
am:
5652b43cca
Change-Id: I55960d3184c1959b1ac7a09930050d8d9acae1c0
Nicolas Geoffray [Fri, 11 May 2018 10:29:21 +0000 (03:29 -0700)]
Merge "Move registration of AssetManager.mObject to zygote." into pi-dev
am:
85ec63532f
Change-Id: I5f8035cb13d51a038b81ddc779e2881f683eb200
Nicolas Geoffray [Fri, 11 May 2018 10:17:37 +0000 (10:17 +0000)]
Revert "Revert "Add static analysis data.""
bug:
64382372
Merged-in: I188a69ad05fffa69be79fec36b180fc9f76998fa
Merged-in: Ie0696a5eecf610165c4b9c339a789f76964a0623
Test: m
This reverts commit
a11a78549d0930ddfc27746ab67b64f3e64f6004.
Change-Id: I8e82aa8cb30052555cbc4020ebe8a0c1157dc6e6
David Brazdil [Fri, 11 May 2018 10:15:41 +0000 (03:15 -0700)]
[automerger skipped] Greylist hidden methods for exempting trusted test code am:
34a06b86bd -s ours
am:
a12ca888a5 -s ours
Change-Id: Ic8728b77e710ca39d89d2e43d3b5aa8dafa26ab8
Nicolas Geoffray [Fri, 11 May 2018 10:13:42 +0000 (10:13 +0000)]
Merge "Move registration of AssetManager.mObject to zygote." into pi-dev
Nicolas Geoffray [Fri, 11 May 2018 10:08:01 +0000 (11:08 +0100)]
Add static analysis data.
bug:
64382372
Test: m
Change-Id: Ie0696a5eecf610165c4b9c339a789f76964a0623
Merged-in: I188a69ad05fffa69be79fec36b180fc9f76998fa
David Brazdil [Fri, 11 May 2018 10:02:49 +0000 (03:02 -0700)]
[automerger skipped] Greylist hidden methods for exempting trusted test code
am:
34a06b86bd -s ours
Change-Id: I86a5c92cf69e6a5eb937917e509055ad359790e2
hughchen [Fri, 11 May 2018 09:54:35 +0000 (02:54 -0700)]
Merge "Add new type into metrics_constants.proto" into pi-dev am:
603824a6e7
am:
a1515b588e
Change-Id: Id6fafb25aaaffea432358dd770318b438254b761
David Brazdil [Wed, 9 May 2018 17:02:03 +0000 (18:02 +0100)]
Greylist hidden methods for exempting trusted test code
Bug:
64382372
Test: N/A
Merged-In: I8bcc3d23d0b942e70a16a9d28ea0d21ce4fe75a2
Change-Id: I8bcc3d23d0b942e70a16a9d28ea0d21ce4fe75a2
(cherry picked from commit
0e348c5013b37843302fb2d3c558fd7961c592a4)
hughchen [Fri, 11 May 2018 09:45:32 +0000 (02:45 -0700)]
Merge "Add new type into metrics_constants.proto" into pi-dev
am:
603824a6e7
Change-Id: I419e9c5a2a540b71b1c0f4499b68e77be925b57d
TreeHugger Robot [Fri, 11 May 2018 09:33:20 +0000 (09:33 +0000)]
Merge "Add new type into metrics_constants.proto" into pi-dev