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

412691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amin Shaikh
d3b63bc4bf Merge "Update systemui wifi icons to GM2." into qt-dev 
am: f8b98bb10d

Change-Id: I78f788c6a1bc34fe77d34dd2f716ae39fb7ba2b0
 2019-04-04 16:28:48 -07:00
TreeHugger Robot
f8b98bb10d Merge "Update systemui wifi icons to GM2." into qt-dev 2019-04-04 23:10:28 +00:00
Amith Yamasani
25d80e7b5c Merge "Fix for NetworkStats/Telephony deadlock" into qt-dev 
am: fcc3c44d88

Change-Id: I860f53f63df73291bb5be40668e4e4729597f933
 2019-04-04 16:03:13 -07:00
TreeHugger Robot
fcc3c44d88 Merge "Fix for NetworkStats/Telephony deadlock" into qt-dev 2019-04-04 22:48:01 +00:00
Keun young Park
41b2ea6471 Test flaky test: Always wait for handle task to complete 
am: e320cdb441

Change-Id: I18fdc1648a3b313c75dc0f2f5a7198e18c56b69d
 2019-04-04 14:49:43 -07:00
Amin Shaikh
dd73e161ff Update systemui wifi icons to GM2. 
Remove unneeded NeutralGoodDrawable.

Bug: 124106839
Test: make; used sysui demo mode
Change-Id: Ib3e903d83be140b00410e3adbb31f217b562d372
 2019-04-04 16:58:10 -04:00
Keun young Park
e320cdb441 Test flaky test: Always wait for handle task to complete 
- Previous logic of checking queue to wait or not has race as queue can be
  emptied while posted task is not complete.
- Do not check queue and always wait for new post to complete.

Bug: 129896850
Test: Run the test many times
Change-Id: Ie0e4447cf997cbe343c7e00a8dfd0757b061b547
(cherry picked from commit 819d7406ac)
 2019-04-04 16:37:27 +00: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
Lorenzo Colitti
614ab3dd4e Merge "Fix flaky UdpEncapsulationSocket test" am: 13078345c5 
am: ae9f7b6723

Change-Id: Idf040a67e53d9b9ec6e6c647ce24f8ada501d355
 2019-04-04 09:18:29 -07:00
Amith Yamasani
d78542bb52 Fix for NetworkStats/Telephony deadlock 
Call into NetworkStatsService to update uid foreground
state without the NPMS lock held. Both calls are from
the handler thread, so no sequencing issues.

Bug: 123274986
Bug: 74007921
Test: atest CtsHostsideNetworkTests
Change-Id: I9e8449e5a75db616e646f55c930ff82982fc9083
 2019-04-04 15:34:43 +00: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
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
TreeHugger Robot
0454f3b8ae Merge "Force app to draw navigation bar background" into qt-dev 2019-04-04 09:24:31 +00: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
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
Cody Kesting
7620e8985a Merge "Clarify documentation for TelMan#iccOpenLogicalChannel." am: 4d71a57887 
am: c7ca13334b

Change-Id: I712217a06052a541cd0a658f7929ff203a5b9c14
 2019-04-04 01:15:02 -07: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
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
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
Rich Cannings
1ea0bce72a [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
 2019-04-04 00:06:47 -07:00
Rich Cannings
726b90f167 [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
 2019-04-04 00:05:25 -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
Matthew Ng
f03c3a6398 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
 2019-04-04 06:39:26 +00: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
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
Chen Xu
7871659f67 Merge "scrub pii (imsi) from carrierIdentifier logging" 2019-04-04 01:53:53 +00:00
Yifan Hong
e4d640b3a8 Merge "Fix NetworkStackTests." 2019-04-04 01:21:34 +00:00