Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
412,707 Commits 3 Branches 0 Tags
e158836907a00a364a1be26fae4da48d49f72248
Commit Graph

412707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rubin Xu
e158836907 [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
 2019-04-04 00:36:57 -07:00
Rich Cannings
bf634f31e1 [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
 2019-04-04 00:35:05 -07:00
Rubin Xu
1b13f7d5db [automerger skipped] DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache am: 567f2357f9 -s ours 
am: f68a3a5891

Change-Id: I05f2975b0bc81c5628a0e7bee7328d41526c74f8
 2019-04-04 00:12:41 -07:00
Rich Cannings
3b960a8dea [automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am: 820b2504f3 -s ours 
am: 2d53e9d2ab

Change-Id: I22884779bd6b3432374ddc52c742e2703d5ad5dd
 2019-04-04 00:08:00 -07:00
Rubin Xu
f68a3a5891 [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
 2019-04-03 23:55:44 -07:00
Rich Cannings
2d53e9d2ab [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
 2019-04-03 23:53:40 -07:00
TreeHugger Robot
9e9a0a08a1 Merge "Force app to draw navigation bar background" 2019-04-04 05:20:46 +00:00
Colin Cross
4c76987106 Merge "Export framework-res raw resources to robolectric" am: 8ea6953a12 am: 2fbbe40e59 
am: 4f1d54037f

Change-Id: I3e298436ed414d8ac67cc07b13b5226ef6ffb2a6
 2019-04-03 21:55:23 -07:00
Colin Cross
4f1d54037f Merge "Export framework-res raw resources to robolectric" am: 8ea6953a12 
am: 2fbbe40e59

Change-Id: Iaac55e71b125692f7d25b185a9ccad3c1eb8bbb9
 2019-04-03 21:39:25 -07:00
Lorenzo Colitti
a88c48e3f2 Merge "Temporarily disable InetDiagSocketTest." am: 5f2ae0dfbd am: b318f8a490 
am: 91b050f9c7

Change-Id: Ic93de6960a2355103d69b083932effb2df83355d
 2019-04-03 21:32:03 -07:00
Lorenzo Colitti
91b050f9c7 Merge "Temporarily disable InetDiagSocketTest." am: 5f2ae0dfbd 
am: b318f8a490

Change-Id: I641da63d15ffbe6d5d2c8f39aeb39cb0a253899f
 2019-04-03 21:20:34 -07:00
Colin Cross
2fbbe40e59 Merge "Export framework-res raw resources to robolectric" 
am: 8ea6953a12

Change-Id: Icec447394dc0cf347f1b4af6826ab9ec5ddf83ef
 2019-04-03 21:20:21 -07:00
Lorenzo Colitti
b318f8a490 Merge "Temporarily disable InetDiagSocketTest." 
am: 5f2ae0dfbd

Change-Id: I7530c58091cff748e3eca9324cc66f7bec7e02b6
 2019-04-03 21:10:16 -07:00
Colin Cross
8ea6953a12 Merge "Export framework-res raw resources to robolectric" 2019-04-04 04:00:13 +00:00
Treehugger Robot
5f2ae0dfbd Merge "Temporarily disable InetDiagSocketTest." 2019-04-04 03:48:29 +00:00
Chen Xu
2220b0f45e [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
 2019-04-03 20:47:50 -07:00
Android Build Merger (Role)
bb09415a06 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" 2019-04-04 03:39:03 +00:00
Chen Xu
4335f2ab32 [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
 2019-04-03 20:38:16 -07:00
Christine Franks
e0bd8ab330 Merge "Guard CDS settings against USER_NULL" 2019-04-04 03:31:20 +00:00
TreeHugger Robot
b5bbfa742e Merge "Batterystats: "none" Data connection state should reflect only out of service" 2019-04-04 03:30:58 +00:00
Yifan Hong
cb6111929a Merge "Merge "Fix NetworkStackTests." am: e4d640b3a8 am: ab98e503be" into pi-dev-plus-aosp 
am: a185e8bd08

Change-Id: Id6040b6132779ba6668fae29fad198bef793642a
 2019-04-03 20:18:44 -07:00
Yin-Chia Yeh
b6e470f056 Merge "Camera: add QCIF resolution exception" into pi-dev am: 5b09928b22 
am: 2518bcd55c

Change-Id: Iaadc8b31e41c50b975c674cf194fadff9af074c7
 2019-04-03 19:54:25 -07:00
Rich Cannings
4fd16e01ba [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
 2019-04-03 19:44:07 -07:00
Android Build Merger (Role)
6c6dcce516 Merge "Merge "scrub pii (imsi) from carrierIdentifier logging" am: 7871659f67 am: 44b5e3389f" into pi-dev-plus-aosp 2019-04-04 02:40:31 +00:00
Chen Xu
4f3696d15b Merge "scrub pii (imsi) from carrierIdentifier logging" am: 7871659f67 
am: 44b5e3389f

Change-Id: I6815b047df9c9a96e86e9f983ffd93c9fce7dfb3
 2019-04-03 19:39:57 -07:00
TreeHugger Robot
1ea486b5ca Merge "Fix remaining pointer leaks in Asset.cpp" 2019-04-04 02:35:22 +00:00
Android Build Merger (Role)
a185e8bd08 Merge "Merge "Fix NetworkStackTests." am: e4d640b3a8 am: ab98e503be" into pi-dev-plus-aosp 2019-04-04 02:34:11 +00:00
Yifan Hong
1a7322d74b Merge "Fix NetworkStackTests." am: e4d640b3a8 
am: ab98e503be

Change-Id: I58e50c970c3dd739a18699beb900a5843efeb395
 2019-04-03 19:33:51 -07:00
Yin-Chia Yeh
2518bcd55c Merge "Camera: add QCIF resolution exception" into pi-dev 
am: 5b09928b22

Change-Id: Ifddeaab9f19d121bf3e77ab08f831255de1b1ad1
 2019-04-03 19:29:04 -07:00
PO HUNG CHEN
478df73041 Merge "Add SD card support for AOT" 2019-04-04 02:27:37 +00:00
TreeHugger Robot
7bdb242a06 Merge "ApplicationLoaders: hard failures & tests" 2019-04-04 02:12:16 +00:00
Rich Cannings
e5b407a224 Merge "DO NOT MERGE Make a copy of data stored in LockSettingsStorage cache" into pi-dev 
am: 9bdc35b2df

Change-Id: Ie32bbb676bd105864cc4f823481b9fb78cf250be
 2019-04-03 19:11:36 -07:00
Chen Xu
44b5e3389f Merge "scrub pii (imsi) from carrierIdentifier logging" 
am: 7871659f67

Change-Id: I1db6ee51e908d1e777981798bee78225aa795ee9
 2019-04-03 19:09:51 -07:00
Yifan Hong
ab98e503be Merge "Fix NetworkStackTests." 
am: e4d640b3a8

Change-Id: Ia02f3b4788ddc7fac3327b82d0b3f2bf8c19d49b
 2019-04-03 19:03:26 -07:00
Lorenzo Colitti
e8a44acc0c Temporarily disable InetDiagSocketTest. 
This test is too flaky to run in presubmits.

Bug: 124354087
Test: atest InetDiagSocketTest
Change-Id: I90bc52a6f5b92d634862e3464634dfdbd3cada6a
 2019-04-04 02:02:13 +00:00
Android Build Merger (Role)
7de8483a2b Merge "Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887 am: c7ca13334b am: 47a11c51b9" 2019-04-04 01:57:53 +00:00
Cody Kesting
41d5edb370 Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887 am: c7ca13334b 
am: 47a11c51b9

Change-Id: I9bb60cec839fc9db4cfeab3b945a7c824a37bedf
 2019-04-03 18:57:11 -07:00
Chen Xu
7871659f67 Merge "scrub pii (imsi) from carrierIdentifier logging" 2019-04-04 01:53:53 +00:00
Todd Kennedy
b19115917d Merge "fix nullability" 2019-04-04 01:53:45 +00:00
Chris Forbes
e429d2535d [automerger skipped] Merge "[DO NOT MERGE] resolve merge conflicts of 157f05eb04 to pi-dev-plus-aosp" into pi-dev-plus-aosp 
am: a506be5fd0 -s ours
am skip reason: subject contains skip directive

Change-Id: I4559be479951bf521e3d17335bf1417708ecb2c5
 2019-04-03 18:49:50 -07:00
paulhu
3ffe2fb80b Merge "Fix ConnectivityServiceTest fail." am: fa8fc65340 am: ccc12f673b 
am: 71c6372844

Change-Id: I0230ea353a91283328c8df06ca5a89af99c40468
 2019-04-03 18:47:51 -07:00
Cody Kesting
47a11c51b9 Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887 
am: c7ca13334b

Change-Id: I7ea9113d3f2dfc27172a533dee33e1918f67ad99
 2019-04-03 18:39:58 -07:00
Christine Franks
a518d7aaa5 Merge "Add display white balance enabled methods to CDS" 2019-04-04 01:38:46 +00:00
Android Build Merger (Role)
b382a91b68 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" 2019-04-04 01:33:07 +00:00
Jack Yu
e56573b308 [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
 2019-04-03 18:31:23 -07:00
TreeHugger Robot
920ddb9b66 Merge "Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" 2019-04-04 01:28:23 +00:00
Chris Forbes
a506be5fd0 Merge "[DO NOT MERGE] resolve merge conflicts of 157f05eb04 to pi-dev-plus-aosp" into pi-dev-plus-aosp 2019-04-04 01:27:01 +00:00
Kevin Chyn
0644557a1f Merge "Fix enumerate corner case" 2019-04-04 01:26:54 +00:00
Yifan Hong
e4d640b3a8 Merge "Fix NetworkStackTests." 2019-04-04 01:21:34 +00:00
Yifan Hong
0e5459731f Fix NetworkStackTests. 
NetworkStackTests dlopens library which indirectly
uses libcgrouprc. Add it to jni_libs.

Test: atest
Fixes: 129902619
Change-Id: I0d60d7a317fa60607d6fdaea15f61b458aefd2f0
 2019-04-03 18:15:22 -07:00