OSDN Git Service
Kevin Chyn [Fri, 1 Mar 2019 02:55:10 +0000 (18:55 -0800)]
Check for NPE when sending enroll result
It's possible for the client to crash and have the service continue to
receive results for a short amount of time.
Bug:
126212114
Test: system server doesn't die anymore
Change-Id: I574b605eba50169a611cae8e95c46aa61defcb9c
Xin Li [Tue, 26 Feb 2019 03:17:12 +0000 (19:17 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master am:
f90d07b1b3 -s ours
am:
fd53b5bb5c -s ours
am skip reason: subject contains skip directive
Change-Id: Id92cda80ee1afb5ebef1815480e14c4c674752fc
Svetoslav Ganov [Tue, 26 Feb 2019 03:09:40 +0000 (03:09 +0000)]
Merge "Disable historical permission usage collection"
TreeHugger Robot [Tue, 26 Feb 2019 02:58:29 +0000 (02:58 +0000)]
Merge "Add Settings Contextual homepage log metrics"
TreeHugger Robot [Tue, 26 Feb 2019 02:54:13 +0000 (02:54 +0000)]
Merge "Add status parameter to window tracing dump help"
TreeHugger Robot [Tue, 26 Feb 2019 02:47:45 +0000 (02:47 +0000)]
Merge "Fix the second augmented autofill request timed out issue by setting the right callback in the AutofillProxy"
Amy Zhang [Tue, 26 Feb 2019 02:44:46 +0000 (02:44 +0000)]
Merge "Use system device name as OSD name"
Amy Zhang [Tue, 26 Feb 2019 02:44:30 +0000 (02:44 +0000)]
Merge "Add TvInputCallback to dynamically add/remove/update the TvInputInfo to HDMI device info/port id mapping"
Xin Li [Tue, 26 Feb 2019 02:42:07 +0000 (18:42 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master
am:
f90d07b1b3 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia5bdfa13266268f317d62fc56dfbb3501efb50ff
TreeHugger Robot [Tue, 26 Feb 2019 02:39:36 +0000 (02:39 +0000)]
Merge "Added DeviceConfig properties for Augmented Autofill service timeouts."
Wei Sheng Shih [Tue, 26 Feb 2019 02:33:49 +0000 (02:33 +0000)]
Merge "Remove meaningless parameter in IActivityTaskManager#setLockScreenShown"
TreeHugger Robot [Tue, 26 Feb 2019 02:13:10 +0000 (02:13 +0000)]
Merge "Enable mainline module feature."
TreeHugger Robot [Tue, 26 Feb 2019 02:07:53 +0000 (02:07 +0000)]
Merge "Fix StorageController bugs."
Yunfan Chen [Tue, 26 Feb 2019 01:58:10 +0000 (01:58 +0000)]
Merge "Protect mock with lock to fix flakiness, add two tests to presubmit"
Kiyoung Kim [Tue, 26 Feb 2019 01:44:28 +0000 (01:44 +0000)]
Merge "Schematize Crypto state system property"
Xin Li [Tue, 26 Feb 2019 01:16:05 +0000 (17:16 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master am:
b455c3a7f3 -s ours
am:
bc88a2dcdb -s ours
am skip reason: subject contains skip directive
Change-Id: I2b3cf7ba11fc80010badbb212902a5507d5caae0
TreeHugger Robot [Tue, 26 Feb 2019 00:57:44 +0000 (00:57 +0000)]
Merge "Fix a dead lock for SubtitleTrack"
Feng Cao [Mon, 25 Feb 2019 02:18:47 +0000 (18:18 -0800)]
Fix the second augmented autofill request timed out issue by setting the right callback in the AutofillProxy
Fixes:
123045011
Test: atest CtsAutoFillServiceTestCases
Change-Id: I8fa7f4fdea0c20b9b6ddaec22c9d27bfb8f19892
Felipe Leme [Fri, 22 Feb 2019 02:01:47 +0000 (18:01 -0800)]
Added DeviceConfig properties for Augmented Autofill service timeouts.
Test: manual verification
Bug:
123100811
Change-Id: I82749b4cea5fe90998efa0798fb6b032a8470086
Xin Li [Tue, 26 Feb 2019 00:13:06 +0000 (16:13 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master
am:
b455c3a7f3 -s ours
am skip reason: subject contains skip directive
Change-Id: I6c115125bad894bbb597557f2e9c3de3eb2b95b5
Rob Carr [Mon, 25 Feb 2019 23:57:26 +0000 (23:57 +0000)]
Merge "Exclude secure layers from most screenshots taken by the system server."
TreeHugger Robot [Mon, 25 Feb 2019 23:16:16 +0000 (23:16 +0000)]
Merge "Fix fillwindow destory() throwing IllegalStateException if update is never called."
Kevin Chyn [Mon, 25 Feb 2019 22:52:28 +0000 (22:52 +0000)]
Merge "Adhere to HIDL contract on cancel() method"
TreeHugger Robot [Mon, 25 Feb 2019 22:42:17 +0000 (22:42 +0000)]
Merge "Add ALWAYS_LOCATION_PERMISSIONS for carrier apps."
Dirk Dougherty [Mon, 25 Feb 2019 22:40:06 +0000 (22:40 +0000)]
Merge "For ds-docs build, pass -yamlV2 and -metalavaApiSince."
Toshikazu Saito [Thu, 8 Sep 2016 12:54:25 +0000 (21:54 +0900)]
Fix a dead lock for SubtitleTrack
Dead lock happens in notifyTrackData() and scheduleUpdate() of
TimeProvider. notifyTrackData() gets lock and calls SRTTrack.onData().
SRTTrack gets lock in addCue() but does not get lock in onData(). So
SRTTrack.setTimeProvider() can call before next addCue() is called.
When scheduleUpdate() is called from SRTTrack.setTimeProvider() in that
case, dead lock happens because following reason.
- TimeProvider is already gotten lock in notifyTrackData()
- scheduleUpdate() tries to get lock of TimeProvider but
notifyTrackData() is not finished because SRTTrack.onData() waits for
calling next addCue()
- SRTTrack waits for finishing setTimeProvider() to get lock
- setTimeProvider() is not finished because lock cannot be gotten in
scheduleUpdate()
This fix changes the looper for SubtitleController to the looper used
in TimeProvider$EventHandler not to interrupt a message by
SubtitleController while running notifyTrackData().
Bug:
122051638
Test: check if subtitle works correctly with MediaPlayer
Change-Id: Ib77144c5adb811676899a8d7e7681045663de0d2
Amy Zhang [Mon, 25 Feb 2019 22:19:25 +0000 (22:19 +0000)]
Merge "Operation with TVs that do not support the System Audio Mode"
TreeHugger Robot [Mon, 25 Feb 2019 22:02:15 +0000 (22:02 +0000)]
Merge "Small fix to permanently bind augmented autofill service."
Hyunyoung Song [Mon, 25 Feb 2019 21:59:59 +0000 (21:59 +0000)]
Merge "Add StyleUIChanged field to atoms.proto"
Android Build Merger (Role) [Mon, 25 Feb 2019 21:57:07 +0000 (21:57 +0000)]
Merge "Merge "Remove deleted fields/functions from greylist." am:
037a0879c0 am:
bcaf794579 am:
cac3720248"
Amit Mahajan [Mon, 25 Feb 2019 21:56:05 +0000 (13:56 -0800)]
Merge "Remove deleted fields/functions from greylist." am:
037a0879c0 am:
bcaf794579
am:
cac3720248
Change-Id: I92f7f5bddc6472f85780457ab6c4d1a3cb3b392c
Keun-young Park [Mon, 25 Feb 2019 21:52:26 +0000 (21:52 +0000)]
Merge "Add startUserInForegroundWithListener to IActivityManager"
Android Build Merger (Role) [Mon, 25 Feb 2019 21:49:36 +0000 (21:49 +0000)]
Merge "Merge "Hide RcsMessageStore APIs" am:
35e3d8e897 am:
6ec7ea069d am:
e247d679b7"
Sahin Caliskan [Mon, 25 Feb 2019 21:48:56 +0000 (13:48 -0800)]
Merge "Hide RcsMessageStore APIs" am:
35e3d8e897 am:
6ec7ea069d
am:
e247d679b7
Change-Id: If80ce434ed71ea379bb289c6f3d41ffd4ea3a970
TreeHugger Robot [Mon, 25 Feb 2019 21:44:50 +0000 (21:44 +0000)]
Merge "WM: Don't empty Winscope traces when writing to file."
Chen Xu [Mon, 25 Feb 2019 21:42:47 +0000 (13:42 -0800)]
Merge "API council feedbacks for preciseCall APIs" am:
e05a1cb5db am:
c3045478cc
am:
01c3c948fd
Change-Id: I057d1eed1552956ae4b9e6b19aba7d86d2f09866
TreeHugger Robot [Mon, 25 Feb 2019 21:33:36 +0000 (21:33 +0000)]
Merge "Fix Battery Saver location bugs."
Tyler Gunn [Mon, 25 Feb 2019 21:29:22 +0000 (13:29 -0800)]
[automerger skipped] Merge "Change data types on CallIdentification API." am:
016982ae2f am:
d29c7d63a2
am:
0b0d3022ee -s ours
am skip reason: change_id I42df17506535c1dd598ffd61a44cb0d0440b8159 with SHA1
b483055581 is in history
Change-Id: Id4f796b5790a880ecfd538c6828825f82bb849f2
Android Build Merger (Role) [Mon, 25 Feb 2019 21:19:13 +0000 (21:19 +0000)]
Merge "Merge "Add Class-Filtered getCellSignalStrengths" am:
c020cf5291 am:
2a1c372131 am:
2b5f9c6b20"
Nathan Harold [Mon, 25 Feb 2019 21:17:39 +0000 (13:17 -0800)]
Merge "Add Class-Filtered getCellSignalStrengths" am:
c020cf5291 am:
2a1c372131
am:
2b5f9c6b20
Change-Id: Ieecec3df1245bce08c32062ec2cca9eedcd410a9
TreeHugger Robot [Mon, 25 Feb 2019 21:10:50 +0000 (21:10 +0000)]
Merge "Added a DeviceConfig property for Content Capture idle timeout to unbind from system server."
Android Build Merger (Role) [Mon, 25 Feb 2019 21:10:47 +0000 (21:10 +0000)]
Merge "Merge "Update RulesManagerService after APEX files" am:
ee15067180 am:
7421a00bb0 am:
efaa3e6801"
TreeHugger Robot [Mon, 25 Feb 2019 21:07:48 +0000 (21:07 +0000)]
Merge "Clarify brightness correction API"
TreeHugger Robot [Mon, 25 Feb 2019 21:06:17 +0000 (21:06 +0000)]
Merge "Fix long paths on Windows"
Neil Fuller [Mon, 25 Feb 2019 21:04:14 +0000 (13:04 -0800)]
Merge "Update RulesManagerService after APEX files" am:
ee15067180 am:
7421a00bb0
am:
efaa3e6801
Change-Id: I12b6017fdd0c280b5e023269fb8a52f717528c1c
Mehdi Alizadeh [Mon, 25 Feb 2019 21:02:11 +0000 (21:02 +0000)]
Merge "Make ShortcutInfo@getPersons() systemApi"
TreeHugger Robot [Mon, 25 Feb 2019 20:54:55 +0000 (20:54 +0000)]
Merge "Enforce MANAGE_APP_PREDICTIONS on hasShareTargets"
Fabian Kozynski [Mon, 25 Feb 2019 20:43:53 +0000 (20:43 +0000)]
Merge "Fix visual styles in QSCustomizer and CarrierText"
David Su [Mon, 25 Feb 2019 20:42:35 +0000 (20:42 +0000)]
Merge "wifi.proto: New Fields for Link Probe Metrics"
TreeHugger Robot [Mon, 25 Feb 2019 20:34:44 +0000 (20:34 +0000)]
Merge "Trigger augmented autofill when the app is not important for autofill."
Android Build Merger (Role) [Mon, 25 Feb 2019 20:21:21 +0000 (20:21 +0000)]
Merge "[automerger skipped] Merge "Fixed incorrect data network type when device is on IWLAN" am:
e8eb967389 am:
cfd6493bb8 am:
55d3fb8af4 -s ours am skip reason: change_id I37256517af3bcf7330cefe55a33d6f09af7e1353 with SHA1
2bd032071b is in history"
Jack Yu [Mon, 25 Feb 2019 20:20:40 +0000 (12:20 -0800)]
[automerger skipped] Merge "Fixed incorrect data network type when device is on IWLAN" am:
e8eb967389 am:
cfd6493bb8
am:
55d3fb8af4 -s ours
am skip reason: change_id I37256517af3bcf7330cefe55a33d6f09af7e1353 with SHA1
2bd032071b is in history
Change-Id: I4c2489b877cf98f7e11bfff3164c671d73f27f90
Fabian Kozynski [Mon, 25 Feb 2019 20:13:22 +0000 (20:13 +0000)]
Merge "Add WifiTile secondaryLabel to content description"
Felipe Leme [Mon, 25 Feb 2019 20:10:59 +0000 (20:10 +0000)]
Merge "Documented how to configure user restrictions for AbstractMasterSystemService."
TreeHugger Robot [Mon, 25 Feb 2019 20:09:04 +0000 (20:09 +0000)]
Merge "Use Volume Panel intent in volume dialog"
Feng Cao [Mon, 25 Feb 2019 02:35:48 +0000 (18:35 -0800)]
Fix fillwindow destory() throwing IllegalStateException if update is never called.
Fixes:
126118917
Test: atest android.autofillservice.cts.augmented.AugmentedLoginActivityTest
Change-Id: I87d0436e0aa2088a3272eadb26e7d69777612320
Nandana Dutt [Mon, 25 Feb 2019 19:52:59 +0000 (11:52 -0800)]
Merge "Add a new error code for disallowing concurrent bugreports" am:
2badc1e434 am:
1ae35be3e3
am:
a973019596
Change-Id: Ie9a4bdc744a103b10a30df415524c94e46957ee5
Lorenzo Colitti [Mon, 25 Feb 2019 19:45:27 +0000 (11:45 -0800)]
Merge "Fix RouterAdvertisementDaemon thread leakage problem" am:
1d8977b992 am:
cbb2ae04e1
am:
828cbe8a83
Change-Id: If0be23f0d3f6aba164a3f09c80052311d617063f
Kevin Chyn [Mon, 25 Feb 2019 19:38:57 +0000 (11:38 -0800)]
Adhere to HIDL contract on cancel() method
Do not invoke the cancel method multiple times for a single client. This
currently can happen if the client cancels, and subsequently crashes.
Bug:
126205289
Test: Builds
Change-Id: I542ab23298b02928c872a255d0980d6e7e27f6c3
Sooraj Sasindran [Mon, 25 Feb 2019 19:38:47 +0000 (11:38 -0800)]
[automerger skipped] Merge "use putLong for long config" am:
233b4f140b am:
5018857876
am:
dbfb25ab7a -s ours
am skip reason: change_id Ibb3e9e2fefcc82eab1deecd65ee81aab0fec8c5e with SHA1
5f7ca3a2b9 is in history
Change-Id: Id0538e2a56b621f7661276f835ca969a139b12c0
Chiachang Wang [Mon, 25 Feb 2019 19:31:56 +0000 (11:31 -0800)]
Merge "Injecting data stall event to statsd" am:
2fd3ca6fa0 am:
853d1ae5ac
am:
29f2aff772
Change-Id: I9d3395e7bddd8b8bdb528454a4b3c6636141d58e
Android Build Merger (Role) [Mon, 25 Feb 2019 19:23:18 +0000 (19:23 +0000)]
Merge "[automerger skipped] Merge "Convert Android.mk file to Android.bp" am:
1c2c11990c am:
1b1553fbe0 am:
37cc525081 -s ours am skip reason: change_id I23d8d5a019155a0f3296f7ab75e9b44b7621f3c8 with SHA1
500db62bfa is in history"
Sasha Smundak [Mon, 25 Feb 2019 19:22:49 +0000 (11:22 -0800)]
[automerger skipped] Merge "Convert Android.mk file to Android.bp" am:
1c2c11990c am:
1b1553fbe0
am:
37cc525081 -s ours
am skip reason: change_id I23d8d5a019155a0f3296f7ab75e9b44b7621f3c8 with SHA1
500db62bfa is in history
Change-Id: I58521b52afd7cc6a1f53d695f80773888afd6254
TreeHugger Robot [Mon, 25 Feb 2019 19:22:05 +0000 (19:22 +0000)]
Merge changes from topic "view_tree_batch"
* changes:
Changed Content Catpure workflow so it notifies when multiple changes are made.
Improved how Content Capture events are flushed when activity is resumed / paused.
TreeHugger Robot [Mon, 25 Feb 2019 19:21:52 +0000 (19:21 +0000)]
Merge "Address API council feedback"
Sudheer Shanka [Mon, 25 Feb 2019 19:15:40 +0000 (11:15 -0800)]
[automerger skipped] Merge "Fix potential crash when per-procstate cpu times tracking is turned on." am:
daddc5bb50 am:
38bbdb4de8
am:
0a356c724b -s ours
am skip reason: change_id Id014f23fbe31fed64fba769f14ba4396a003092e with SHA1
020239df85 is in history
Change-Id: Ib8ee2a363bb30043b89c98ff0292899f856d6a48
Amit Mahajan [Mon, 25 Feb 2019 19:15:38 +0000 (11:15 -0800)]
Merge "Remove deleted fields/functions from greylist." am:
037a0879c0
am:
bcaf794579
Change-Id: I19a98cfa1f3226380c7ecdacb57f45bb976fb532
Sahin Caliskan [Mon, 25 Feb 2019 19:10:57 +0000 (11:10 -0800)]
Merge "Hide RcsMessageStore APIs" am:
35e3d8e897
am:
6ec7ea069d
Change-Id: If0389e459250b76ccb03128e14975b23b7cdfbc1
Chen Xu [Mon, 25 Feb 2019 19:06:17 +0000 (11:06 -0800)]
Merge "API council feedbacks for preciseCall APIs" am:
e05a1cb5db
am:
c3045478cc
Change-Id: I0c052bd3fe587eba3864ae2547b7e700c9151e1f
Michele Berionne [Mon, 25 Feb 2019 19:03:02 +0000 (11:03 -0800)]
[automerger skipped] Merge "Add checks on multisim capabilities." am:
862821ede5 am:
811e1165c2
am:
f9a69bc3f6 -s ours
am skip reason: change_id I20860c7a25b054b8312c144544726337e09559e2 with SHA1
1b9e7d1f33 is in history
Change-Id: Ieff84ff095711fa95a60b9c8f546567708ed1a4e
Tyler Gunn [Mon, 25 Feb 2019 19:00:58 +0000 (11:00 -0800)]
Merge "Change data types on CallIdentification API." am:
016982ae2f
am:
d29c7d63a2
Change-Id: I902f8f14350567973ab007b407bfe72ef90c2b2d
Nathan Harold [Mon, 25 Feb 2019 18:50:03 +0000 (10:50 -0800)]
Merge "Add Class-Filtered getCellSignalStrengths" am:
c020cf5291
am:
2a1c372131
Change-Id: Ib397709e307d81ffabcdb54d2c0d51e6ed8eac6a
Amy [Thu, 21 Feb 2019 21:27:26 +0000 (13:27 -0800)]
Use system device name as OSD name
Test: manual
Bug:
113940249
Change-Id: Idfca0008b6a9567c6d4bc4171ba591fb53ff3c24
(cherry picked from commit
e227a1c31661d68abc2489e30af023ace0115960)
Amy [Tue, 19 Feb 2019 20:45:20 +0000 (12:45 -0800)]
Operation with TVs that do not support the System Audio Mode
Note: according to HDMI spec 1.4b cec 13.15.4.2, when non-TV device
inits System Audio Mode, and the amplifier is the Active Source or is on
the Active Path, amplifier can send <Set System Audio Mode on> without
querying TV's support on SAM.
Test: manual
Bug:
80296135
Change-Id: I5c850e1c906f13e60e7c830e8d3d6d3c8e7f118f
(cherry picked from commit
6ebc6a53ae2b55db1526aac94fb754bfd52522fe)
Android Build Merger (Role) [Mon, 25 Feb 2019 18:48:12 +0000 (18:48 +0000)]
Merge "[automerger skipped] Merge "Allow UiAutomation to adopt the shell permission indentity" am:
9f0115bb6e am:
178684530b am:
0acab502a0 -s ours am skip reason: change_id I4bfd4b475225125512abf80ea98cd8fcacb6a1be with SHA1
d873ae62c4 is in history"
Sooraj Sasindran [Mon, 25 Feb 2019 18:47:03 +0000 (10:47 -0800)]
[automerger skipped] Merge "Allow UiAutomation to adopt the shell permission indentity" am:
9f0115bb6e am:
178684530b
am:
0acab502a0 -s ours
am skip reason: change_id I4bfd4b475225125512abf80ea98cd8fcacb6a1be with SHA1
d873ae62c4 is in history
Change-Id: I6ab92aea70c139985953a1f9c78111e4c5bf907b
Nataniel Borges [Mon, 25 Feb 2019 18:45:27 +0000 (10:45 -0800)]
Add status parameter to window tracing dump help
Status is missing from window tracing help.
Test: Flash a device and run `adb shell cmd window tracing help`. Status
should now apper on the list possible commands
Change-Id: I651735b3778f258e0dffb76e262d6cebc65baa79
Amy [Mon, 11 Feb 2019 21:39:39 +0000 (13:39 -0800)]
Add TvInputCallback to dynamically add/remove/update the TvInputInfo to HDMI device
info/port id mapping
Note that we listen to the hotplug event to keep the TvInput
info updated. When there is a device unplugged from the current device,
framework needs to invoke the deviceEventListener and remove the hdmiDeviceOInfo
from TIF. TvInputCallback updates the internal mapping of the current
device.
Test: manual
Bug:
122239611
Change-Id: Id7d9371ad744f0318398a1b6ead28f2bf9f1faad
Android Build Merger (Role) [Mon, 25 Feb 2019 18:40:37 +0000 (18:40 +0000)]
Merge "Merge "Update MbmsDownloadServiceBase to reflect implements IInterface" am:
07037a86d3 am:
0287ddfde2 am:
9bed52b751"
Tor Norbye [Mon, 25 Feb 2019 18:39:06 +0000 (10:39 -0800)]
Merge "Update MbmsDownloadServiceBase to reflect implements IInterface" am:
07037a86d3 am:
0287ddfde2
am:
9bed52b751
Change-Id: Ic7871cc31a32fc91bf0ad945d1088c2e22d8cd3c
Ned Burns [Mon, 25 Feb 2019 18:37:44 +0000 (18:37 +0000)]
Merge "Invert dependency between NEM and RowBinder"
Neil Fuller [Mon, 25 Feb 2019 18:34:33 +0000 (10:34 -0800)]
Merge "Update RulesManagerService after APEX files" am:
ee15067180
am:
7421a00bb0
Change-Id: I86bba886037d93723957a33f913f6fa0c05e8b0f
Android Build Merger (Role) [Mon, 25 Feb 2019 18:33:42 +0000 (18:33 +0000)]
Merge "Merge "Add logging to NetworkStackClient" am:
969abcc46f am:
ab10c4caab am:
0aa42ed8c1"
Remi NGUYEN VAN [Mon, 25 Feb 2019 18:32:55 +0000 (10:32 -0800)]
Merge "Add logging to NetworkStackClient" am:
969abcc46f am:
ab10c4caab
am:
0aa42ed8c1
Change-Id: I7241888c779e8f47161dc2f555e140555134434c
Jack Yu [Mon, 25 Feb 2019 18:29:59 +0000 (10:29 -0800)]
Merge "Fixed incorrect data network type when device is on IWLAN" am:
e8eb967389
am:
cfd6493bb8
Change-Id: Ic611ac2efb3b56fef27f6ba441b22c58eca744a0
Android Build Merger (Role) [Mon, 25 Feb 2019 18:27:26 +0000 (18:27 +0000)]
Merge "Merge "Send special permission information to netd" am:
703e8c68ec am:
676e631646 am:
4f23b09169"
Chenbo Feng [Mon, 25 Feb 2019 18:26:51 +0000 (10:26 -0800)]
Merge "Send special permission information to netd" am:
703e8c68ec am:
676e631646
am:
4f23b09169
Change-Id: Icb1fa5d980f74902fd085580a7534a5ad7cd00a0
TreeHugger Robot [Mon, 25 Feb 2019 18:25:48 +0000 (18:25 +0000)]
Merge "getSimLocale should return locale rather than string tag"
Android Build Merger (Role) [Mon, 25 Feb 2019 18:21:21 +0000 (18:21 +0000)]
Merge "[automerger skipped] Merge "Use toArray(T[]) instead of toArray()." am:
bede9f869b am:
48e3098dbb am:
8a59e14985 -s ours am skip reason: change_id I9d6c8c2b1c3de767b87643f4c3aaff1044e33fbc with SHA1
3a503b6909 is in history"
Nandana Dutt [Mon, 25 Feb 2019 18:20:50 +0000 (10:20 -0800)]
Merge "Add a new error code for disallowing concurrent bugreports" am:
2badc1e434
am:
1ae35be3e3
Change-Id: I7440be8e4605466958d072dd977e0019f13b2193
Garfield Tan [Mon, 25 Feb 2019 18:20:38 +0000 (10:20 -0800)]
[automerger skipped] Merge "Use toArray(T[]) instead of toArray()." am:
bede9f869b am:
48e3098dbb
am:
8a59e14985 -s ours
am skip reason: change_id I9d6c8c2b1c3de767b87643f4c3aaff1044e33fbc with SHA1
3a503b6909 is in history
Change-Id: I847d169a6f394f087c9fcb27b58626132c2d625e
Lorenzo Colitti [Mon, 25 Feb 2019 18:16:14 +0000 (10:16 -0800)]
Merge "Fix RouterAdvertisementDaemon thread leakage problem" am:
1d8977b992
am:
cbb2ae04e1
Change-Id: Ib328be760394deb8682f4926a0b393b0761416fd
Android Build Merger (Role) [Mon, 25 Feb 2019 18:15:06 +0000 (18:15 +0000)]
Merge "Merge "Revert "Revert "Delay start of bootanimation until after the Runtime APEX is mounted.""" am:
c3ae401a98 am:
54b6b9b678 am:
528328cc40"
vichang [Mon, 25 Feb 2019 18:14:33 +0000 (10:14 -0800)]
Merge "Revert "Revert "Delay start of bootanimation until after the Runtime APEX is mounted.""" am:
c3ae401a98 am:
54b6b9b678
am:
528328cc40
Change-Id: I32a07660cfb35c1130eaec7eccc3935d3a1016b6
Sooraj Sasindran [Mon, 25 Feb 2019 18:11:19 +0000 (10:11 -0800)]
Merge "use putLong for long config" am:
233b4f140b
am:
5018857876
Change-Id: I416dcdb2b77a093274a70a97470540f311f3f731
Android Build Merger (Role) [Mon, 25 Feb 2019 18:09:08 +0000 (18:09 +0000)]
Merge "[automerger skipped] Merge "Add feature flag for Dynamic Android" am:
c1e55147c9 am:
3e51385d47 am:
dbfc7f4ef2 -s ours am skip reason: change_id I46efd27a6880dde4bc69aa457a6f3b0fdd9ce5cd with SHA1
8cbedf5647 is in history"
Howard Chen [Mon, 25 Feb 2019 18:08:33 +0000 (10:08 -0800)]
[automerger skipped] Merge "Add feature flag for Dynamic Android" am:
c1e55147c9 am:
3e51385d47
am:
dbfc7f4ef2 -s ours
am skip reason: change_id I46efd27a6880dde4bc69aa457a6f3b0fdd9ce5cd with SHA1
8cbedf5647 is in history
Change-Id: I3166c8c883eefe5c5a6015de902022d2a50d6ae3
Chiachang Wang [Mon, 25 Feb 2019 18:06:07 +0000 (10:06 -0800)]
Merge "Injecting data stall event to statsd" am:
2fd3ca6fa0
am:
853d1ae5ac
Change-Id: I451e06af811d46ff48bc82326e8dd19a3a2e7a7b
Android Build Merger (Role) [Mon, 25 Feb 2019 18:02:48 +0000 (18:02 +0000)]
Merge "Merge "Pick up the apexBootImage pinner service files when the boot image is apex.art." am:
4e4b3ac9c5 am:
f1d3b8da7e am:
ad1c9a4217"
Nicolas Geoffray [Mon, 25 Feb 2019 18:02:21 +0000 (10:02 -0800)]
Merge "Pick up the apexBootImage pinner service files when the boot image is apex.art." am:
4e4b3ac9c5 am:
f1d3b8da7e
am:
ad1c9a4217
Change-Id: I91508282ab1e894f4939eb51502db54cee63fa61
OSDN Git Service
