Commit Graph

412713 Commits

Author SHA1 Message Date
Sasha Smundak
b37e639872 [automerger skipped] Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp" am: 2e96d3f554
am: 8b788b2194 -s ours
am skip reason: change_id If3f574bc15dedcd7880be605667297d257175c8d with SHA1 89eaa93af9 is in history

Change-Id: I066c4422eb1ae87f0e5943063201466756b3891e
2019-04-04 17:56:35 -07:00
Wonsik Kim
d80730f559 Merge "media: fix documentation for MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES" into qt-dev
am: f04a40a607

Change-Id: I1f6aa39dc990783df5fc425f4919bafeb401beb0
2019-04-04 17:42:24 -07:00
Makoto Onuki
79f6fbe6f6 Merge "Change ISE to AssertException, which is more suitable." into qt-dev
am: 5e7b4175b7

Change-Id: Icbee6bef0924b2abcafa7834b739290b2360d10e
2019-04-04 17:35:30 -07:00
Roshan Pius
183edc9565 Merge "WifiManager: Restore network pin behavior on enableNetwork" into qt-dev
am: 8d3cb6b3fd

Change-Id: I24ef25f4b3cd7d8cfb307392ebc2d86005a0b10b
2019-04-04 17:29:14 -07:00
Ben Murdoch
d7fcac064b Merge "Fixup App Compaction CL nits." into qt-dev
am: 393ba51cbd

Change-Id: Ib4454434482b95a571fec83f0ed33b375686f2f5
2019-04-04 17:21:47 -07:00
Wonsik Kim
f04a40a607 Merge "media: fix documentation for MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES" into qt-dev 2019-04-05 00:05:02 +00:00
Makoto Onuki
5e7b4175b7 Merge "Change ISE to AssertException, which is more suitable." into qt-dev 2019-04-04 23:56:29 +00:00
TreeHugger Robot
8d3cb6b3fd Merge "WifiManager: Restore network pin behavior on enableNetwork" into qt-dev 2019-04-04 23:54:13 +00:00
Beverly
8a356a70bf Merge "Don't show dnd suppressed icons on aod" into qt-dev
am: 67fd7ad761

Change-Id: Ie216a6e499d25c8299cd0388565083ce54bd4d66
2019-04-04 16:53:34 -07:00
TreeHugger Robot
393ba51cbd Merge "Fixup App Compaction CL nits." into qt-dev 2019-04-04 23:43:30 +00:00
TreeHugger Robot
67fd7ad761 Merge "Don't show dnd suppressed icons on aod" into qt-dev 2019-04-04 23:42:57 +00:00
Yohei Yukawa
1b3ebb831f Merge "Introduce a result class for IStatusBarService#registerStatusBar()" into qt-dev
am: fd33fe0e8a

Change-Id: Ie3a5bb4d0a5a0ed7956767fc777509ec69695330
2019-04-04 16:38:29 -07:00
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
fd33fe0e8a Merge "Introduce a result class for IStatusBarService#registerStatusBar()" into qt-dev 2019-04-04 23:22:55 +00: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
Makoto Onuki
58d5470580 Change ISE to AssertException, which is more suitable.
Bug: 129139241
Bug: 129721058
Test: Treehugger
Change-Id: I12e97f37a58e1d88731a9bddd933abeb8c1169c1
2019-04-04 13:42:47 -07:00
Wonsik Kim
b06132ad90 media: fix documentation for MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES
Bug: 32746212
Test: builds
Change-Id: I38ecfa879091bc4016fbae04eab77ed6fd9eb1c1
2019-04-04 12:54:59 -07:00
Yohei Yukawa
49efa718a8 Introduce a result class for IStatusBarService#registerStatusBar()
This is a preparation to fix an issue that IME cannot enable light
navigation bar on direct-reply.

The initial state of StatusBar client is provided as return values of
IStatusBarService#registerStatusBar().  However, the way for the
client to receive the return values is to rely on "out" parameters in
the Binder method as follows.

    void registerStatusBar(IStatusBar callbacks,
            out List<String> iconSlots,
            out List<StatusBarIcon> iconList,
            out int[] switches,
            out List<IBinder> binders,
            out Rect fullscreenStackBounds,
            out Rect dockedStackBounds);

The issue is that if I want to add a new parameter into
StatusBarManagerService to fix Bug 122439339, then it needs to be
notified back to the client via one of these out values, e.g. a new
element in "switches", which is hard to understand and maintain.

It'd be better to introduce a dedicated return object as follows.

    RegisterStatusBarResult registerStatusBar(IStatusBar callbacks);

This is a purely mechanical code clean-up.  Hence there should be no
behavior change.

Bug: 122439339
Test: presubmit
Change-Id: Ib1c0ae8f591ca09d0bce7a39f85ba57aad386e47
2019-04-04 11:49:02 -07: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
Sasha Smundak
8b788b2194 Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp"
am: 2e96d3f554

Change-Id: Ia8e12a04fb7fff08926734f042491bbea4a30f32
2019-04-04 09:13:43 -07:00
Treehugger Robot
2e96d3f554 Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp" 2019-04-04 15:55:11 +00:00
Beverly
4bae644417 Don't show dnd suppressed icons on aod
The aod icons are from the shelf. When DND is suppressing
status bar icons and aod is on (mFullyDark), still don't show
the icons that would show on AOD (if DND wasn't on).

Test: manual
Test: atest NotificationIconAreaControllerTest
Fixes: 122636236
Change-Id: I4680ea1c88427207274da48a6ab69f0c00a3ac69
2019-04-04 11:41:15 -04: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
Roshan Pius
31fbd556f6 WifiManager: Restore network pin behavior on enableNetwork
This code is mostly a NO-OP for most apps & OEM's. The pinner only takes
effect if the app's target SDK < Android L. But, there might
be some OEM's who may want to enable this for all apps.

Bug: 129906426
Test: Compiles
Change-Id: Iccf67ba0d4ea8d9c5d3561a128908611636b420e
2019-04-04 14:45:21 +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
Ben Murdoch
9231eaf451 Fixup App Compaction CL nits.
A couple of nits to cleanup from change I71fffc52a232cd5608742d9f36965a4de6494b56

 - remove unused method
 - remove unnecessary null check.

BUG: 128427978
Test: atest FrameworksMockingServicesTests:AppCompactorTest
Change-Id: I363c57fc78529207585f5d1e004770d967ce87b9
2019-04-04 14:29:49 +01: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