OSDN Git Service
TreeHugger Robot [Thu, 4 Apr 2019 21:43:35 +0000 (21:43 +0000)]
Merge "Fix issue #
129936402: Runtime restart occurs when suspending an app..."
TreeHugger Robot [Thu, 4 Apr 2019 21:09:38 +0000 (21:09 +0000)]
Merge "Add option to enable tracing all the launches."
Wei Wang [Thu, 4 Apr 2019 19:49:55 +0000 (19:49 +0000)]
Merge "Fix a few issues with foreground service location accesses."
TreeHugger Robot [Thu, 4 Apr 2019 19:13:33 +0000 (19:13 +0000)]
Merge "make libmedia_jni_utils depends on libgui"
Hui Yu [Thu, 4 Apr 2019 18:34:54 +0000 (18:34 +0000)]
Merge "Do not print exception and stack trace."
TreeHugger Robot [Thu, 4 Apr 2019 18:32:51 +0000 (18:32 +0000)]
Merge "Add back render-ahead support"
TreeHugger Robot [Thu, 4 Apr 2019 18:21:21 +0000 (18:21 +0000)]
Merge "Add draw props back to greylist"
TreeHugger Robot [Thu, 4 Apr 2019 18:14:43 +0000 (18:14 +0000)]
Merge "Prevent accessing companion records from arbitrary uids"
TreeHugger Robot [Thu, 4 Apr 2019 18:06:43 +0000 (18:06 +0000)]
Merge "CompositionSamplingListener: weakly reference listener"
Dianne Hackborn [Thu, 4 Apr 2019 18:01:41 +0000 (11:01 -0700)]
Fix issue #
129936402: Runtime restart occurs when suspending an app...
NPE at com.android.server.appop.AppOpsService.notifyOpChanged(AppOpsService.java:1431)
Wasn't checking for a null callback list, and also fixed threading
issues.
Fixes:
129936402
Test: Manual
Change-Id: I9c39429421643ebc10e78679c2bec52827603da1
Remi NGUYEN VAN [Thu, 4 Apr 2019 16:47:10 +0000 (09:47 -0700)]
Merge "Add common tests for FrameworksBaseTests and CTS" am:
a57e80e60a am:
c7407715ab
am:
72a856f18a
Change-Id: Ic78ff947250871fa773252c924f1dee9395c6074
Lorenzo Colitti [Thu, 4 Apr 2019 16:29:35 +0000 (09:29 -0700)]
Merge "Fix flaky UdpEncapsulationSocket test" am:
13078345c5 am:
ae9f7b6723
am:
614ab3dd4e
Change-Id: Iad9aea4b42cd8b31a5a2659bb9cb54dd1c64e8b7
Remi NGUYEN VAN [Thu, 4 Apr 2019 16:25:22 +0000 (09:25 -0700)]
Merge "Add common tests for FrameworksBaseTests and CTS" am:
a57e80e60a
am:
c7407715ab
Change-Id: I863ffea6358a353986cee7b1c76622c434310bba
TreeHugger Robot [Thu, 4 Apr 2019 16:18:46 +0000 (16:18 +0000)]
Merge changes from topic "fix_attributes_match"
* changes:
fix AudioAttributes matching rule in AudioProductStrategy
Revert "Revert "Mute haptic channels by default.""
Lorenzo Colitti [Thu, 4 Apr 2019 16:18:29 +0000 (09:18 -0700)]
Merge "Fix flaky UdpEncapsulationSocket test" am:
13078345c5
am:
ae9f7b6723
Change-Id: Idf040a67e53d9b9ec6e6c647ce24f8ada501d355
TreeHugger Robot [Thu, 4 Apr 2019 16:08:09 +0000 (16:08 +0000)]
Merge "Test flaky test: Always wait for handle task to complete"
Evan Laird [Thu, 4 Apr 2019 15:33:53 +0000 (15:33 +0000)]
Merge "Expose notification guts on menu shown"
TreeHugger Robot [Thu, 4 Apr 2019 14:32:55 +0000 (14:32 +0000)]
Merge "Update icon for Calendar permission."
Chalard Jean [Thu, 4 Apr 2019 14:15:35 +0000 (07:15 -0700)]
Merge "Fix a possible crash when the listener is null" into qt-dev am:
dd07ae579c
am:
14d635ac5b
Change-Id: Id8151886ab1d26101e02f9abe9e21c58c7236623
Chalard Jean [Thu, 4 Apr 2019 14:05:37 +0000 (07:05 -0700)]
Merge "Fix a possible crash when the listener is null" into qt-dev
am:
dd07ae579c
Change-Id: I325fd3eda6e89228353342f00a49f50b22b17071
TreeHugger Robot [Thu, 4 Apr 2019 13:50:10 +0000 (13:50 +0000)]
Merge "Fix a possible crash when the listener is null" into qt-dev
Remi NGUYEN VAN [Thu, 4 Apr 2019 12:42:21 +0000 (05:42 -0700)]
Merge "Add common tests for FrameworksBaseTests and CTS"
am:
a57e80e60a
Change-Id: I1616831ad8f143298b80ebce9af205f8e50de1f8
Treehugger Robot [Thu, 4 Apr 2019 12:29:44 +0000 (12:29 +0000)]
Merge "Add common tests for FrameworksBaseTests and CTS"
Chalard Jean [Thu, 4 Apr 2019 09:39:32 +0000 (18:39 +0900)]
Fix a possible crash when the listener is null
Test: manual
Bug:
129930804
Change-Id: Id598ae1d98154b19d156e52973cf379669e7060c
Jorim Jaggi [Thu, 4 Apr 2019 10:30:31 +0000 (03:30 -0700)]
Merge "Force app to draw navigation bar background" into qt-dev am:
0454f3b8ae
am:
e07de8fc65
Change-Id: I8a195157a0b98217a5b710ad38c99cb56ee8f65f
Colin Cross [Thu, 4 Apr 2019 10:12:40 +0000 (03:12 -0700)]
Merge "Merge "Export framework-res raw resources to robolectric" am:
8ea6953a12 am:
2fbbe40e59" into qt-dev-plus-aosp
am:
aa037f5fd0
Change-Id: If4538e2ac7fcf7e2dbea5fce0dcf50e0aeece876
Matthew Ng [Thu, 4 Apr 2019 09:50:16 +0000 (02:50 -0700)]
Merge "Ime in gestural mode will have ime switcher and down arrow" into qt-dev am:
9ad8aa3ad6
am:
a143236652
Change-Id: Ib447691ca41089e9f884d679da3f92b17c29380b
Lorenzo Colitti [Thu, 4 Apr 2019 09:44:53 +0000 (02:44 -0700)]
Merge "Temporarily disable InetDiagSocketTest." am:
5f2ae0dfbd am:
b318f8a490
am:
fdc03bab0b
Change-Id: Ide5ac3f5316c4671b17fb9486ac56fc5feaf7b08
Jorim Jaggi [Thu, 4 Apr 2019 09:40:53 +0000 (02:40 -0700)]
Merge "Force app to draw navigation bar background" into qt-dev
am:
0454f3b8ae
Change-Id: I815f86cf6a1c9a14f9ed369c9f939c3c1b98cd09
Chen Xu [Thu, 4 Apr 2019 09:37:14 +0000 (02:37 -0700)]
[automerger skipped] Merge "scrub pii (imsi) from carrierIdentifier logging" am:
7871659f67 am:
44b5e3389f -s ours
am:
4fc9883a7e -s ours
am skip reason: change_id I642d60e4ba1001bfd481aada87fa08dbd19098be with SHA1
61b2c86719 is in history
Change-Id: Ie24170d932e5a9d8a567888b7708deea99b8b900
TreeHugger Robot [Thu, 4 Apr 2019 09:24:31 +0000 (09:24 +0000)]
Merge "Force app to draw navigation bar background" into qt-dev
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
Android Build Merger (Role) [Thu, 4 Apr 2019 09:00:16 +0000 (09:00 +0000)]
Merge "Merge "Export framework-res raw resources to robolectric" am:
8ea6953a12 am:
2fbbe40e59" into qt-dev-plus-aosp
Matthew Ng [Thu, 4 Apr 2019 08:58:31 +0000 (01:58 -0700)]
Merge "Ime in gestural mode will have ime switcher and down arrow" into qt-dev
am:
9ad8aa3ad6
Change-Id: Iff99ec432a7937ff0521a2329fe9349bd293608a
Colin Cross [Thu, 4 Apr 2019 08:57:45 +0000 (01:57 -0700)]
Merge "Export framework-res raw resources to robolectric" am:
8ea6953a12
am:
2fbbe40e59
Change-Id: I61542865ae6248a898450de9abb92f3069bb02e3
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
Lorenzo Colitti [Thu, 4 Apr 2019 08:51:30 +0000 (01:51 -0700)]
Merge "Temporarily disable InetDiagSocketTest." am:
5f2ae0dfbd
am:
b318f8a490
Change-Id: Ic580b9261e0d556ec10f92ddffd8f2766e25f424
Chen Xu [Thu, 4 Apr 2019 08:45:43 +0000 (01:45 -0700)]
[automerger skipped] Merge "scrub pii (imsi) from carrierIdentifier logging" am:
7871659f67
am:
44b5e3389f -s ours
am skip reason: change_id I642d60e4ba1001bfd481aada87fa08dbd19098be with SHA1
61b2c86719 is in history
Change-Id: I2299794a693c8a2d580644b34331ec3067e2fad2
TreeHugger Robot [Thu, 4 Apr 2019 08:40:31 +0000 (08:40 +0000)]
Merge "Ime in gestural mode will have ime switcher and down arrow" into qt-dev
Lorenzo Colitti [Thu, 4 Apr 2019 08:38:02 +0000 (01:38 -0700)]
Merge "Fix flaky UdpEncapsulationSocket test"
am:
13078345c5
Change-Id: I4d6cc85fcd539a38674fc3daff1af57fa1bdd2f7
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"
Lorenzo Colitti [Thu, 4 Apr 2019 08:09:06 +0000 (08:09 +0000)]
Merge "Fix flaky UdpEncapsulationSocket test"
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
Jorim Jaggi [Mon, 11 Mar 2019 21:23:16 +0000 (14:23 -0700)]
Force app to draw navigation bar background
For gestural navigation, having a small bar drawn by SystemUI
looks really really weird. Since we force the status bar
background to be drawn in the client, we can also force the
navigation bar background without expecting any compat issues.
Bug:
129751541
Test: Open legacy app, ensure black is drawn in the client
Change-Id: I9cd4c5dd799324ff10bf9d28750e8f238ab1e459
(cherry picked from commit
461bb11371e956ab1ab2e19940d393d9d729be54)
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
Matthew Ng [Wed, 3 Apr 2019 20:52:57 +0000 (13:52 -0700)]
Ime in gestural mode will have ime switcher and down arrow
When in gestural mode, the navigation bar will inset the ime window
higher to raise up revealing the original height of the navigation bar.
In place will be the (alt) back button (pointing down), the handle and
ime switcher (if should be shown).
Fixes:
128928130
Bug:
113952590
Bug:
112934365
Test: manual
Change-Id: I28cc4def846cb09eb2d7ab00d12561f0c198dbbc
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
OSDN Git Service
