OSDN Git Service
Yifan Hong [Thu, 4 Apr 2019 09:22:42 +0000 (02:22 -0700)]
Merge "Fix NetworkStackTests." am:
e4d640b3a8 am:
ab98e503be
am:
f6e7cb2caf
Change-Id: Ie02b6f9d464570bfa7c79c84ca34ab2ad9b46718
Cody Kesting [Thu, 4 Apr 2019 09:14:28 +0000 (02:14 -0700)]
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am:
4d71a57887 am:
c7ca13334b
am:
7620e8985a
Change-Id: I99db998447173dbc659a1e17cb648ec1fc15809d
paulhu [Thu, 4 Apr 2019 08:53:31 +0000 (01:53 -0700)]
Merge "Fix ConnectivityServiceTest fail." am:
fa8fc65340 am:
ccc12f673b
am:
7d21507852
Change-Id: Ic77ef73841266da487401ffd657ef63562b6fc1e
Yifan Hong [Thu, 4 Apr 2019 08:20:06 +0000 (01:20 -0700)]
Merge "Fix NetworkStackTests." am:
e4d640b3a8
am:
ab98e503be
Change-Id: Id80883c77518d8e144ee0c3f591e6467c02a203e
Jack Yu [Thu, 4 Apr 2019 08:20:03 +0000 (01:20 -0700)]
[automerger skipped] Merge "Removed data and voice RAT from service state" am:
ced4a31769 am:
279a924fdf -s ours
am:
8f0ba600ba -s ours
am skip reason: change_id I3f4cb6057a4ae821363099583eeac7c867147afb with SHA1
138e2af543 is in history
Change-Id: Ic4d680eb6c5aed2e7a6ffef4aec254ca50279e07
Cody Kesting [Thu, 4 Apr 2019 08:15:02 +0000 (01:15 -0700)]
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am:
4d71a57887
am:
c7ca13334b
Change-Id: I712217a06052a541cd0a658f7929ff203a5b9c14
TreeHugger Robot [Thu, 4 Apr 2019 08:09:48 +0000 (08:09 +0000)]
Merge "Don't update process-level configutaion for MSIME process"
paulhu [Thu, 4 Apr 2019 07:57:26 +0000 (00:57 -0700)]
Merge "Fix ConnectivityServiceTest fail." am:
fa8fc65340
am:
ccc12f673b
Change-Id: I7f185e731db91c30a9b0f14aefbdbb067942190e
Yin-Chia Yeh [Thu, 4 Apr 2019 07:52:29 +0000 (00:52 -0700)]
Merge "Camera: add QCIF resolution exception" into pi-dev am:
5b09928b22 am:
796820aa92
am:
abd018e5d9
Change-Id: I36780620298d3a5630d0d2288d78dba914c9b26a
Jack Yu [Thu, 4 Apr 2019 07:48:06 +0000 (00:48 -0700)]
[automerger skipped] Merge "Removed data and voice RAT from service state" am:
ced4a31769
am:
279a924fdf -s ours
am skip reason: change_id I3f4cb6057a4ae821363099583eeac7c867147afb with SHA1
5ff5ab5649 is in history
Change-Id: Ibdc66cdfee886cebd29f4f023eaa02e8b5ea8d8f
Rich Cannings [Thu, 4 Apr 2019 07:44:46 +0000 (00:44 -0700)]
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev am:
9bdc35b2df -s ours am:
1ea0bce72a
am:
64e8f72665 -s ours
am skip reason: subject contains skip directive
Change-Id: I44d66d0b01622ca9085796d464f94097474dd41f
Rich Cannings [Thu, 4 Apr 2019 07:43:17 +0000 (00:43 -0700)]
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am:
157f05eb04 -s ours am:
726b90f167
am:
5f6ddccee6 -s ours
am skip reason: subject contains skip directive
Change-Id: I31be04f5fc14bb9ecd44cd51f67a1ad8ab723228
Rubin Xu [Thu, 4 Apr 2019 07:36:57 +0000 (00:36 -0700)]
[automerger skipped] DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache am:
567f2357f9 -s ours am:
f68a3a5891
am:
1b13f7d5db -s ours
am skip reason: subject contains skip directive
Change-Id: Id9a567298f6938d42ecd14d4b79794c53daa3db0
Rich Cannings [Thu, 4 Apr 2019 07:35:05 +0000 (00:35 -0700)]
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am:
820b2504f3 -s ours am:
2d53e9d2ab
am:
3b960a8dea -s ours
am skip reason: subject contains skip directive
Change-Id: I1a64dc4665591e820915f2046a7e8da518f3503e
Yin-Chia Yeh [Thu, 4 Apr 2019 07:34:05 +0000 (00:34 -0700)]
Merge "Camera: add QCIF resolution exception" into pi-dev am:
5b09928b22
am:
796820aa92
Change-Id: Ie4c3901832ef4808db0428a0825c1673c9334f07
Rich Cannings [Thu, 4 Apr 2019 07:28:27 +0000 (00:28 -0700)]
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev am:
9bdc35b2df -s ours
am:
1ea0bce72a
Change-Id: Ica00080cedab5e38e3930b5a3b347dc636fe020a
Rich Cannings [Thu, 4 Apr 2019 07:22:42 +0000 (00:22 -0700)]
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am:
157f05eb04 -s ours
am:
726b90f167
Change-Id: I4cb8f0000b765ce9b241ecda5d64c852ab547ee8
Yin-Chia Yeh [Thu, 4 Apr 2019 07:14:38 +0000 (00:14 -0700)]
Merge "Camera: add QCIF resolution exception" into pi-dev
am:
5b09928b22
Change-Id: I20e60ef6d84c969b1651e449f5a076183d38a7c9
Rubin Xu [Thu, 4 Apr 2019 07:12:41 +0000 (00:12 -0700)]
[automerger skipped] DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache am:
567f2357f9 -s ours
am:
f68a3a5891
Change-Id: I05f2975b0bc81c5628a0e7bee7328d41526c74f8
Rich Cannings [Thu, 4 Apr 2019 07:08:00 +0000 (00:08 -0700)]
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am:
820b2504f3 -s ours
am:
2d53e9d2ab
Change-Id: I22884779bd6b3432374ddc52c742e2703d5ad5dd
Rich Cannings [Thu, 4 Apr 2019 07:06:47 +0000 (00:06 -0700)]
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev
am:
9bdc35b2df -s ours
am skip reason: subject contains skip directive
Change-Id: Iec753dfc9cebc31463c427d5ad2bae47205ed11e
Rich Cannings [Thu, 4 Apr 2019 07:05:25 +0000 (00:05 -0700)]
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
am:
157f05eb04 -s ours
am skip reason: subject contains skip directive
Change-Id: I33d588642ad1fb9a4820507f1ea39c9eccc0c9f8
Rubin Xu [Thu, 4 Apr 2019 06:55:44 +0000 (23:55 -0700)]
[automerger skipped] DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache
am:
567f2357f9 -s ours
am skip reason: subject contains skip directive
Change-Id: I6cd88a157c5de9109215ec52ecad66687446d2ab
Rich Cannings [Thu, 4 Apr 2019 06:53:40 +0000 (23:53 -0700)]
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[]
am:
820b2504f3 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia8e21b690d4966e3334db646d12bfe7e2bad4151
lumark [Tue, 2 Apr 2019 06:56:46 +0000 (14:56 +0800)]
Don't update process-level configutaion for MSIME process
Currently, process-level display configuration change for IME process
is only for single-client IME window moving to another display to update
UI layout according display configuration.
It's not applicable for MSIME use case since other IMEs on other displays
will also receive this configuration change due to IME services use
the same application config/context, so add a check to fix this issue.
Fix:
129723692
Test: atest MultiDisplaySystemDecorationTests
Test: manual
1. Enable config_perDisplayFocusEnabled config,
2. Install MultiClientInputMethod app
3. Set multi client IME component by "adb shell setprop persist.debug.multi_client_ime \
com.example.android.multiclientinputmethod/.MultiClientInputMethod"
4. Reboot device to initiate MultiClientInputMethod
5. In Settings -> developer options -> Enable Simulated display &
Force desktop mode.
6. Reboot device to enable multi-display test environment.
7. In primary & external display, launch app with EditText.
8. Focus EditText in both displays and see if keyboard can displayed
with correct layout.
Change-Id: Ic556ca212d285de183e3709b032427d5d97e0623
TreeHugger Robot [Thu, 4 Apr 2019 05:20:46 +0000 (05:20 +0000)]
Merge "Force app to draw navigation bar background"
Colin Cross [Thu, 4 Apr 2019 04:55:23 +0000 (21:55 -0700)]
Merge "Export framework-res raw resources to robolectric" am:
8ea6953a12 am:
2fbbe40e59
am:
4f1d54037f
Change-Id: I3e298436ed414d8ac67cc07b13b5226ef6ffb2a6
Colin Cross [Thu, 4 Apr 2019 04:39:25 +0000 (21:39 -0700)]
Merge "Export framework-res raw resources to robolectric" am:
8ea6953a12
am:
2fbbe40e59
Change-Id: Iaac55e71b125692f7d25b185a9ccad3c1eb8bbb9
Lorenzo Colitti [Thu, 4 Apr 2019 04:32:03 +0000 (21:32 -0700)]
Merge "Temporarily disable InetDiagSocketTest." am:
5f2ae0dfbd am:
b318f8a490
am:
91b050f9c7
Change-Id: Ic93de6960a2355103d69b083932effb2df83355d
Lorenzo Colitti [Thu, 4 Apr 2019 04:20:34 +0000 (21:20 -0700)]
Merge "Temporarily disable InetDiagSocketTest." am:
5f2ae0dfbd
am:
b318f8a490
Change-Id: I641da63d15ffbe6d5d2c8f39aeb39cb0a253899f
Colin Cross [Thu, 4 Apr 2019 04:20:21 +0000 (21:20 -0700)]
Merge "Export framework-res raw resources to robolectric"
am:
8ea6953a12
Change-Id: Icec447394dc0cf347f1b4af6826ab9ec5ddf83ef
Lorenzo Colitti [Thu, 4 Apr 2019 04:10:16 +0000 (21:10 -0700)]
Merge "Temporarily disable InetDiagSocketTest."
am:
5f2ae0dfbd
Change-Id: I7530c58091cff748e3eca9324cc66f7bec7e02b6
Colin Cross [Thu, 4 Apr 2019 04:00:13 +0000 (04:00 +0000)]
Merge "Export framework-res raw resources to robolectric"
Treehugger Robot [Thu, 4 Apr 2019 03:48:29 +0000 (03:48 +0000)]
Merge "Temporarily disable InetDiagSocketTest."
Chen Xu [Thu, 4 Apr 2019 03:47:50 +0000 (20:47 -0700)]
[automerger skipped] Merge "Merge "scrub pii (imsi) from carrierIdentifier logging" am:
7871659f67 am:
44b5e3389f" into pi-dev-plus-aosp
am:
6c6dcce516 -s ours
am skip reason: change_id I642d60e4ba1001bfd481aada87fa08dbd19098be with SHA1
c33a47fece is in history
Change-Id: Ib9381e8ebecbdee6a91e9ad268e26d85d7cfa5e0
Android Build Merger (Role) [Thu, 4 Apr 2019 03:39:03 +0000 (03:39 +0000)]
Merge "[automerger skipped] Merge "scrub pii (imsi) from carrierIdentifier logging" am:
7871659f67 am:
44b5e3389f am:
4f3696d15b -s ours am skip reason: change_id I642d60e4ba1001bfd481aada87fa08dbd19098be with SHA1
61b2c86719 is in history"
Chen Xu [Thu, 4 Apr 2019 03:38:16 +0000 (20:38 -0700)]
[automerger skipped] Merge "scrub pii (imsi) from carrierIdentifier logging" am:
7871659f67 am:
44b5e3389f
am:
4f3696d15b -s ours
am skip reason: change_id I642d60e4ba1001bfd481aada87fa08dbd19098be with SHA1
61b2c86719 is in history
Change-Id: Ibf4d50fddab5600110330e198f58e27937abf99e
Christine Franks [Thu, 4 Apr 2019 03:31:20 +0000 (03:31 +0000)]
Merge "Guard CDS settings against USER_NULL"
TreeHugger Robot [Thu, 4 Apr 2019 03:30:58 +0000 (03:30 +0000)]
Merge "Batterystats: "none" Data connection state should reflect only out of service"
Yifan Hong [Thu, 4 Apr 2019 03:18:44 +0000 (20:18 -0700)]
Merge "Merge "Fix NetworkStackTests." am:
e4d640b3a8 am:
ab98e503be" into pi-dev-plus-aosp
am:
a185e8bd08
Change-Id: Id6040b6132779ba6668fae29fad198bef793642a
Yin-Chia Yeh [Thu, 4 Apr 2019 02:54:25 +0000 (19:54 -0700)]
Merge "Camera: add QCIF resolution exception" into pi-dev am:
5b09928b22
am:
2518bcd55c
Change-Id: Iaadc8b31e41c50b975c674cf194fadff9af074c7
Rich Cannings [Thu, 4 Apr 2019 02:44:07 +0000 (19:44 -0700)]
[automerger skipped] Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev am:
9bdc35b2df
am:
e5b407a224 -s ours
am skip reason: subject contains skip directive
Change-Id: If7fa68f065e97db5f38537c8ffe10b7344e5b846
Android Build Merger (Role) [Thu, 4 Apr 2019 02:40:31 +0000 (02:40 +0000)]
Merge "Merge "scrub pii (imsi) from carrierIdentifier logging" am:
7871659f67 am:
44b5e3389f" into pi-dev-plus-aosp
Chen Xu [Thu, 4 Apr 2019 02:39:57 +0000 (19:39 -0700)]
Merge "scrub pii (imsi) from carrierIdentifier logging" am:
7871659f67
am:
44b5e3389f
Change-Id: I6815b047df9c9a96e86e9f983ffd93c9fce7dfb3
TreeHugger Robot [Thu, 4 Apr 2019 02:35:22 +0000 (02:35 +0000)]
Merge "Fix remaining pointer leaks in Asset.cpp"
Android Build Merger (Role) [Thu, 4 Apr 2019 02:34:11 +0000 (02:34 +0000)]
Merge "Merge "Fix NetworkStackTests." am:
e4d640b3a8 am:
ab98e503be" into pi-dev-plus-aosp
Yifan Hong [Thu, 4 Apr 2019 02:33:51 +0000 (19:33 -0700)]
Merge "Fix NetworkStackTests." am:
e4d640b3a8
am:
ab98e503be
Change-Id: I58e50c970c3dd739a18699beb900a5843efeb395
Yin-Chia Yeh [Thu, 4 Apr 2019 02:29:04 +0000 (19:29 -0700)]
Merge "Camera: add QCIF resolution exception" into pi-dev
am:
5b09928b22
Change-Id: Ifddeaab9f19d121bf3e77ab08f831255de1b1ad1
PO HUNG CHEN [Thu, 4 Apr 2019 02:27:37 +0000 (02:27 +0000)]
Merge "Add SD card support for AOT"
TreeHugger Robot [Thu, 4 Apr 2019 02:12:16 +0000 (02:12 +0000)]
Merge "ApplicationLoaders: hard failures & tests"
Rich Cannings [Thu, 4 Apr 2019 02:11:36 +0000 (19:11 -0700)]
Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev
am:
9bdc35b2df
Change-Id: Ie32bbb676bd105864cc4f823481b9fb78cf250be
Chen Xu [Thu, 4 Apr 2019 02:09:51 +0000 (19:09 -0700)]
Merge "scrub pii (imsi) from carrierIdentifier logging"
am:
7871659f67
Change-Id: I1db6ee51e908d1e777981798bee78225aa795ee9
Yifan Hong [Thu, 4 Apr 2019 02:03:26 +0000 (19:03 -0700)]
Merge "Fix NetworkStackTests."
am:
e4d640b3a8
Change-Id: Ia02f3b4788ddc7fac3327b82d0b3f2bf8c19d49b
Lorenzo Colitti [Thu, 4 Apr 2019 01:24:54 +0000 (10:24 +0900)]
Temporarily disable InetDiagSocketTest.
This test is too flaky to run in presubmits.
Bug:
124354087
Test: atest InetDiagSocketTest
Change-Id: I90bc52a6f5b92d634862e3464634dfdbd3cada6a
Android Build Merger (Role) [Thu, 4 Apr 2019 01:57:53 +0000 (01:57 +0000)]
Merge "Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am:
4d71a57887 am:
c7ca13334b am:
47a11c51b9"
Cody Kesting [Thu, 4 Apr 2019 01:57:11 +0000 (18:57 -0700)]
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am:
4d71a57887 am:
c7ca13334b
am:
47a11c51b9
Change-Id: I9bb60cec839fc9db4cfeab3b945a7c824a37bedf
Chen Xu [Thu, 4 Apr 2019 01:53:53 +0000 (01:53 +0000)]
Merge "scrub pii (imsi) from carrierIdentifier logging"
Todd Kennedy [Thu, 4 Apr 2019 01:53:45 +0000 (01:53 +0000)]
Merge "fix nullability"
Chris Forbes [Thu, 4 Apr 2019 01:49:50 +0000 (18:49 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] resolve merge conflicts of
157f05eb0437c297d928951c3695f2cf5a845898 to pi-dev-plus-aosp" into pi-dev-plus-aosp
am:
a506be5fd0 -s ours
am skip reason: subject contains skip directive
Change-Id: I4559be479951bf521e3d17335bf1417708ecb2c5
paulhu [Thu, 4 Apr 2019 01:47:51 +0000 (18:47 -0700)]
Merge "Fix ConnectivityServiceTest fail." am:
fa8fc65340 am:
ccc12f673b
am:
71c6372844
Change-Id: I0230ea353a91283328c8df06ca5a89af99c40468
Cody Kesting [Thu, 4 Apr 2019 01:39:58 +0000 (18:39 -0700)]
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am:
4d71a57887
am:
c7ca13334b
Change-Id: I7ea9113d3f2dfc27172a533dee33e1918f67ad99
Christine Franks [Thu, 4 Apr 2019 01:38:46 +0000 (01:38 +0000)]
Merge "Add display white balance enabled methods to CDS"
Android Build Merger (Role) [Thu, 4 Apr 2019 01:33:07 +0000 (01:33 +0000)]
Merge "[automerger skipped] Merge "Removed data and voice RAT from service state" am:
ced4a31769 am:
279a924fdf am:
f3c6f0e47c -s ours am skip reason: change_id I3f4cb6057a4ae821363099583eeac7c867147afb with SHA1
5ff5ab5649 is in history"
Jack Yu [Thu, 4 Apr 2019 01:31:23 +0000 (18:31 -0700)]
[automerger skipped] Merge "Removed data and voice RAT from service state" am:
ced4a31769 am:
279a924fdf
am:
f3c6f0e47c -s ours
am skip reason: change_id I3f4cb6057a4ae821363099583eeac7c867147afb with SHA1
5ff5ab5649 is in history
Change-Id: I36c1ffc0680b6a1630eee2349e419cc7a9a25b1d
TreeHugger Robot [Thu, 4 Apr 2019 01:28:23 +0000 (01:28 +0000)]
Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView"
Chris Forbes [Thu, 4 Apr 2019 01:27:01 +0000 (01:27 +0000)]
Merge "[DO NOT MERGE] resolve merge conflicts of
157f05eb0437c297d928951c3695f2cf5a845898 to pi-dev-plus-aosp" into pi-dev-plus-aosp
Kevin Chyn [Thu, 4 Apr 2019 01:26:54 +0000 (01:26 +0000)]
Merge "Fix enumerate corner case"
Yifan Hong [Thu, 4 Apr 2019 01:21:34 +0000 (01:21 +0000)]
Merge "Fix NetworkStackTests."
Yifan Hong [Thu, 4 Apr 2019 01:15:22 +0000 (18:15 -0700)]
Fix NetworkStackTests.
NetworkStackTests dlopens library which indirectly
uses libcgrouprc. Add it to jni_libs.
Test: atest
Fixes:
129902619
Change-Id: I0d60d7a317fa60607d6fdaea15f61b458aefd2f0
Cody Kesting [Thu, 4 Apr 2019 00:59:43 +0000 (17:59 -0700)]
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel."
am:
4d71a57887
Change-Id: I89b28e0297aea91443d7c40df1f99f646ee7b237
paulhu [Thu, 4 Apr 2019 00:57:14 +0000 (17:57 -0700)]
Merge "Fix ConnectivityServiceTest fail." am:
fa8fc65340
am:
ccc12f673b
Change-Id: I7896f6c47478df6f4b70b68da98694f4b0e1563f
Bill Rassieur [Thu, 4 Apr 2019 00:50:35 +0000 (17:50 -0700)]
Merge master@
5428150 into git_qt-dev-plus-aosp.
am:
bea579f238
Change-Id: I49b4a82ccabbcdd0b2b2be3abf95d796414666c6
Jack Yu [Thu, 4 Apr 2019 00:41:58 +0000 (17:41 -0700)]
Merge "Removed data and voice RAT from service state" am:
ced4a31769
am:
279a924fdf
Change-Id: I4712f051f85511426af2207679224266ea0aa29e
Kevin Chyn [Thu, 4 Apr 2019 00:35:01 +0000 (00:35 +0000)]
Merge "Update BiometricPrompt default title"
chen xu [Thu, 28 Mar 2019 23:28:45 +0000 (16:28 -0700)]
scrub pii (imsi) from carrierIdentifier logging
Bug:
129229239
Test: Manual
Change-Id: I642d60e4ba1001bfd481aada87fa08dbd19098be
(cherry picked from commit
61b2c86719b0d599a2ecde8aeaa4369167e893cf)
Merged-in: I642d60e4ba1001bfd481aada87fa08dbd19098be
paulhu [Thu, 4 Apr 2019 00:24:39 +0000 (17:24 -0700)]
Merge "Fix ConnectivityServiceTest fail."
am:
fa8fc65340
Change-Id: If3f7a3cbf2ed1a180a3b09872512a5f91bddd89c
Mark Renouf [Thu, 4 Apr 2019 00:23:36 +0000 (00:23 +0000)]
Merge "Set system gesture exclusion rects for Bubbles"
Xiangyu/Malcolm Chen [Thu, 4 Apr 2019 00:13:58 +0000 (17:13 -0700)]
[automerger skipped] Merge "Clean up a few names of Telephony intent extra." am:
63bf486921 am:
2cadf8e9f9
am:
3722b6907f -s ours
am skip reason: change_id Iaf004d6881964bd19072e9ef623f2e89f2529639 with SHA1
2e1f945a6c is in history
Change-Id: Ic1bf053d7233e1068aa3d2d5b4512e6626d9a4cf
Jack Yu [Thu, 4 Apr 2019 00:13:45 +0000 (17:13 -0700)]
Merge "Removed data and voice RAT from service state"
am:
ced4a31769
Change-Id: I2ef8a5d4647d404d5b782e78c8ab2613f6466f92
Susi Kharraz-Post [Thu, 4 Apr 2019 00:03:56 +0000 (00:03 +0000)]
Merge "Add logging for direct share target"
Jack He [Thu, 4 Apr 2019 00:01:16 +0000 (00:01 +0000)]
Merge "Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged"
Cody Kesting [Thu, 4 Apr 2019 00:01:06 +0000 (00:01 +0000)]
Merge "Clarify documentation for TelMan#iccOpenLogicalChannel."
Lucas Dupin [Thu, 4 Apr 2019 00:00:23 +0000 (00:00 +0000)]
Merge "Make KeyguardSliceView title tappable"
TreeHugger Robot [Wed, 3 Apr 2019 23:57:20 +0000 (23:57 +0000)]
Merge "Convert core/tests/BroadcastRadioTests/Android.mk file to Android.bp"
TreeHugger Robot [Wed, 3 Apr 2019 23:57:10 +0000 (23:57 +0000)]
Merge "Disallow pruning system shared static libraries"
Treehugger Robot [Wed, 3 Apr 2019 23:54:38 +0000 (23:54 +0000)]
Merge "Fix ConnectivityServiceTest fail."
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:49:33 +0000 (16:49 -0700)]
Merge "Clean up a few names of Telephony intent extra." am:
63bf486921
am:
2cadf8e9f9
Change-Id: I1026c87f73abc5dccee6c1b5a1747c53e436b5f0
Kevin Chyn [Wed, 3 Apr 2019 23:46:14 +0000 (23:46 +0000)]
Merge "Make get/set feature async between settings and service"
Jack He [Wed, 3 Apr 2019 23:08:21 +0000 (16:08 -0700)]
Atom: Keep obfuscated_id name in BluetoothConnectionStateChanged
Bug:
112969790
Test: make, test drive with statsd
Change-Id: Ic732d48b69799f241a0e96c159b06c778392d2bf
TreeHugger Robot [Wed, 3 Apr 2019 23:44:26 +0000 (23:44 +0000)]
Merge "Move NetworkStatsFactory into service directory"
Bill Rassieur [Wed, 3 Apr 2019 23:41:27 +0000 (16:41 -0700)]
Merge master@
5406228 into git_qt-dev-plus-aosp.
am:
bf3de50711
Change-Id: I684e995988f5a8ef330fbbf55da7ae9230f0cfc2
Jack Yu [Wed, 3 Apr 2019 23:39:24 +0000 (23:39 +0000)]
Merge "Removed data and voice RAT from service state"
Christine Franks [Wed, 3 Apr 2019 23:37:32 +0000 (23:37 +0000)]
Merge "Reserve display white balance metric"
Shuo Qian [Wed, 3 Apr 2019 23:28:45 +0000 (16:28 -0700)]
[automerger skipped] Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" am:
b8c7afacec am:
4362b01d2c
am:
47fdabe9fa -s ours
am skip reason: change_id If82bfc5102a9ac1d7e07ff744c0775a1dc95ba2c with SHA1
c6d55453ee is in history
Change-Id: I1f15c088f35ec60918c7296317969907c2699297
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:24:23 +0000 (16:24 -0700)]
Merge "Clean up a few names of Telephony intent extra."
am:
63bf486921
Change-Id: If08d387b21a4e4cb71e7026ca781a472db51e2d1
Winson Chung [Wed, 3 Apr 2019 23:24:07 +0000 (23:24 +0000)]
Merge "Differentiate the edge sensitivity from the edge panel size"
Lucas Dupin [Wed, 3 Apr 2019 23:15:50 +0000 (23:15 +0000)]
Merge "Delete unnecessary cache"
Shuo Qian [Wed, 3 Apr 2019 23:15:05 +0000 (16:15 -0700)]
Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" am:
b8c7afacec
am:
4362b01d2c
Change-Id: I74e90fc150b6928e244a35aabeb865b6ad521810
Xiangyu/Malcolm Chen [Wed, 3 Apr 2019 23:06:47 +0000 (23:06 +0000)]
Merge "Clean up a few names of Telephony intent extra."
TreeHugger Robot [Wed, 3 Apr 2019 23:05:48 +0000 (23:05 +0000)]
Merge "Add per-file owner for CursorWindow.cpp"
OSDN Git Service
