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

412764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi NGUYEN VAN
054e3e0f5e Merge "Add common tests for FrameworksBaseTests and CTS" am: a57e80e60a am: c7407715ab 
am: 72a856f18a

Change-Id: Ic78ff947250871fa773252c924f1dee9395c6074
 2019-04-04 09:47:10 -07:00
Lorenzo Colitti
85db258145 Merge "Fix flaky UdpEncapsulationSocket test" am: 13078345c5 am: ae9f7b6723 
am: 614ab3dd4e

Change-Id: Iad9aea4b42cd8b31a5a2659bb9cb54dd1c64e8b7
 2019-04-04 09:29:35 -07:00
Remi NGUYEN VAN
72a856f18a Merge "Add common tests for FrameworksBaseTests and CTS" am: a57e80e60a 
am: c7407715ab

Change-Id: I863ffea6358a353986cee7b1c76622c434310bba
 2019-04-04 09:25:22 -07:00
TreeHugger Robot
cae417b6f1 Merge changes from topic "fix_attributes_match" 
* changes:
  fix AudioAttributes matching rule in AudioProductStrategy
  Revert "Revert "Mute haptic channels by default.""
 2019-04-04 16:18:46 +00:00
Lorenzo Colitti
614ab3dd4e Merge "Fix flaky UdpEncapsulationSocket test" am: 13078345c5 
am: ae9f7b6723

Change-Id: Idf040a67e53d9b9ec6e6c647ce24f8ada501d355
 2019-04-04 09:18:29 -07:00
TreeHugger Robot
93ceee8684 Merge "Test flaky test: Always wait for handle task to complete" 2019-04-04 16:08:09 +00:00
Evan Laird
1e522e456e Merge "Expose notification guts on menu shown" 2019-04-04 15:33:53 +00:00
TreeHugger Robot
0f3d14b66e Merge "Update icon for Calendar permission." 2019-04-04 14:32:55 +00:00
Chalard Jean
8b23ab1d61 Merge "Fix a possible crash when the listener is null" into qt-dev am: dd07ae579c 
am: 14d635ac5b

Change-Id: Id8151886ab1d26101e02f9abe9e21c58c7236623
 2019-04-04 07:15:35 -07:00
Chalard Jean
14d635ac5b Merge "Fix a possible crash when the listener is null" into qt-dev 
am: dd07ae579c

Change-Id: I325fd3eda6e89228353342f00a49f50b22b17071
 2019-04-04 07:05:37 -07:00
TreeHugger Robot
dd07ae579c Merge "Fix a possible crash when the listener is null" into qt-dev 2019-04-04 13:50:10 +00:00
Remi NGUYEN VAN
c7407715ab Merge "Add common tests for FrameworksBaseTests and CTS" 
am: a57e80e60a

Change-Id: I1616831ad8f143298b80ebce9af205f8e50de1f8
 2019-04-04 05:42:21 -07:00
Treehugger Robot
a57e80e60a Merge "Add common tests for FrameworksBaseTests and CTS" 2019-04-04 12:29:44 +00:00
Chalard Jean
2867145522 Fix a possible crash when the listener is null 
Test: manual
Bug: 129930804
Change-Id: Id598ae1d98154b19d156e52973cf379669e7060c
 2019-04-04 10:56:32 +00:00
Jorim Jaggi
955116f67d Merge "Force app to draw navigation bar background" into qt-dev am: 0454f3b8ae 
am: e07de8fc65

Change-Id: I8a195157a0b98217a5b710ad38c99cb56ee8f65f
 2019-04-04 03:30:31 -07:00
Colin Cross
446473de6d Merge "Merge "Export framework-res raw resources to robolectric" am: 8ea6953a12 am: 2fbbe40e59" into qt-dev-plus-aosp 
am: aa037f5fd0

Change-Id: If4538e2ac7fcf7e2dbea5fce0dcf50e0aeece876
 2019-04-04 03:12:40 -07:00
Matthew Ng
7a2141ef50 Merge "Ime in gestural mode will have ime switcher and down arrow" into qt-dev am: 9ad8aa3ad6 
am: a143236652

Change-Id: Ib447691ca41089e9f884d679da3f92b17c29380b
 2019-04-04 02:50:16 -07:00
Lorenzo Colitti
dd0369a57d Merge "Temporarily disable InetDiagSocketTest." am: 5f2ae0dfbd am: b318f8a490 
am: fdc03bab0b

Change-Id: Ide5ac3f5316c4671b17fb9486ac56fc5feaf7b08
 2019-04-04 02:44:53 -07:00
Jorim Jaggi
e07de8fc65 Merge "Force app to draw navigation bar background" into qt-dev 
am: 0454f3b8ae

Change-Id: I815f86cf6a1c9a14f9ed369c9f939c3c1b98cd09
 2019-04-04 02:40:53 -07:00
Chen Xu
e6752a1a01 [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
 2019-04-04 02:37:14 -07:00
TreeHugger Robot
0454f3b8ae Merge "Force app to draw navigation bar background" into qt-dev 2019-04-04 09:24:31 +00:00
Yifan Hong
b31848e601 Merge "Fix NetworkStackTests." am: e4d640b3a8 am: ab98e503be 
am: f6e7cb2caf

Change-Id: Ie02b6f9d464570bfa7c79c84ca34ab2ad9b46718
 2019-04-04 02:22:42 -07:00
Cody Kesting
f04cd4e304 Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887 am: c7ca13334b 
am: 7620e8985a

Change-Id: I99db998447173dbc659a1e17cb648ec1fc15809d
 2019-04-04 02:14:28 -07:00
Android Build Merger (Role)
aa037f5fd0 Merge "Merge "Export framework-res raw resources to robolectric" am: 8ea6953a12 am: 2fbbe40e59" into qt-dev-plus-aosp 2019-04-04 09:00:16 +00:00
Matthew Ng
a143236652 Merge "Ime in gestural mode will have ime switcher and down arrow" into qt-dev 
am: 9ad8aa3ad6

Change-Id: Iff99ec432a7937ff0521a2329fe9349bd293608a
 2019-04-04 01:58:31 -07:00
Colin Cross
e0535826c5 Merge "Export framework-res raw resources to robolectric" am: 8ea6953a12 
am: 2fbbe40e59

Change-Id: I61542865ae6248a898450de9abb92f3069bb02e3
 2019-04-04 01:57:45 -07:00
paulhu
10ab5783bd Merge "Fix ConnectivityServiceTest fail." am: fa8fc65340 am: ccc12f673b 
am: 7d21507852

Change-Id: Ic77ef73841266da487401ffd657ef63562b6fc1e
 2019-04-04 01:53:31 -07:00
Lorenzo Colitti
fdc03bab0b Merge "Temporarily disable InetDiagSocketTest." am: 5f2ae0dfbd 
am: b318f8a490

Change-Id: Ic580b9261e0d556ec10f92ddffd8f2766e25f424
 2019-04-04 01:51:30 -07:00
Chen Xu
4fc9883a7e [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
 2019-04-04 01:45:43 -07:00
TreeHugger Robot
9ad8aa3ad6 Merge "Ime in gestural mode will have ime switcher and down arrow" into qt-dev 2019-04-04 08:40:31 +00:00
Lorenzo Colitti
ae9f7b6723 Merge "Fix flaky UdpEncapsulationSocket test" 
am: 13078345c5

Change-Id: I4d6cc85fcd539a38674fc3daff1af57fa1bdd2f7
 2019-04-04 01:38:02 -07:00
Yifan Hong
f6e7cb2caf Merge "Fix NetworkStackTests." am: e4d640b3a8 
am: ab98e503be

Change-Id: Id80883c77518d8e144ee0c3f591e6467c02a203e
 2019-04-04 01:20:06 -07:00
Jack Yu
03e7a8792e [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
 2019-04-04 01:20:03 -07:00
Cody Kesting
7620e8985a Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887 
am: c7ca13334b

Change-Id: I712217a06052a541cd0a658f7929ff203a5b9c14
 2019-04-04 01:15:02 -07:00
TreeHugger Robot
114535975f Merge "Don't update process-level configutaion for MSIME process" 2019-04-04 08:09:48 +00:00
Lorenzo Colitti
13078345c5 Merge "Fix flaky UdpEncapsulationSocket test" 2019-04-04 08:09:06 +00:00
paulhu
7d21507852 Merge "Fix ConnectivityServiceTest fail." am: fa8fc65340 
am: ccc12f673b

Change-Id: I7f185e731db91c30a9b0f14aefbdbb067942190e
 2019-04-04 00:57:26 -07:00
Yin-Chia Yeh
3bf1341677 Merge "Camera: add QCIF resolution exception" into pi-dev am: 5b09928b22 am: 796820aa92 
am: abd018e5d9

Change-Id: I36780620298d3a5630d0d2288d78dba914c9b26a
 2019-04-04 00:52:29 -07:00
Jack Yu
8f0ba600ba [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
 2019-04-04 00:48:06 -07:00
Rich Cannings
f0c824bb33 [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
 2019-04-04 00:44:46 -07:00
Rich Cannings
29a26dcbc1 [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
 2019-04-04 00:43:17 -07:00
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
Yin-Chia Yeh
abd018e5d9 Merge "Camera: add QCIF resolution exception" into pi-dev am: 5b09928b22 
am: 796820aa92

Change-Id: Ie4c3901832ef4808db0428a0825c1673c9334f07
 2019-04-04 00:34:05 -07:00
Rich Cannings
64e8f72665 [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
 2019-04-04 00:28:27 -07:00
Jorim Jaggi
a6aabacbb5 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 461bb11371)
 2019-04-04 07:27:10 +00:00
Rich Cannings
5f6ddccee6 [automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am: 157f05eb04 -s ours 
am: 726b90f167

Change-Id: I4cb8f0000b765ce9b241ecda5d64c852ab547ee8
 2019-04-04 00:22:42 -07:00
Yin-Chia Yeh
796820aa92 Merge "Camera: add QCIF resolution exception" into pi-dev 
am: 5b09928b22

Change-Id: I20e60ef6d84c969b1651e449f5a076183d38a7c9
 2019-04-04 00:14:38 -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