Commit Graph

468813 Commits

Author SHA1 Message Date
Treehugger Robot
f1a0c3abea Merge "Use exposed permission defintion in Tethering" 2020-02-21 11:27:17 +00:00
Automerger Merge Worker
5c7bc2062f Merge "Cleanup framework-all usage" am: 38ca6040ea
Change-Id: Ibd572914f2fefc2883d8514cc0a999d957cd2af3
2020-02-21 11:14:22 +00:00
Antoan Angelov
1ab8e44c06 Merge "Exempt-From-Owner-Approval: Workaround for build break on WifiNl80211Manager" 2020-02-21 11:12:43 +00:00
TreeHugger Robot
b3704648f2 Merge "Ensure user is unlocked before binding to KeyChain service" 2020-02-21 11:08:51 +00:00
Chalard Jean
94fa6dc345 Merge changes Ia91b3b3c,Id9ecdac5,I4b17d1b1
* changes:
  Revert "[NS D01] Remove candidates that don't satisfy the request."
  Revert "[NS D02] Mix in the ignore on wifi policy."
  Revert "Address comments on ag/10316753"
2020-02-21 11:06:55 +00:00
Anton Hansson
358a2d2c99 Merge "framework-wifi: Stop linking all frameworks/base/core/java AIDLs" 2020-02-21 11:01:15 +00:00
TreeHugger Robot
248267c37a Merge "Add tracepoint for stats pulling" 2020-02-21 11:00:24 +00:00
Anton Hansson
38ca6040ea Merge "Cleanup framework-all usage" 2020-02-21 10:59:55 +00:00
Al Sutton
feebe8143e Revert "Add feature flag for "no data" backup calls"
This reverts commit 27c64a3bed.

Reason for revert: The GMSCore code to handle the flag will be part of DP2 and so we can remove the flag ahead of the cut.

GMSCore CL Status; https://cl-status.corp.google.com/#/summary/gmscore_prod/291378558
GMSCore Calendar; http://go/gms-schedule

Bug: 147481066
Test: m -j RunBackupFrameworksServicesRoboTests
Change-Id: I4159e064e739c6f366063c7fadd7cca40a7f07d9
2020-02-21 10:49:57 +00:00
Automerger Merge Worker
02d8c1b634 Merge "Remove useless thread checks" am: 269d32a0fa am: c53b4accde am: 11c3205f05
Change-Id: Ib091ec185495184867b77528aee7492b9b571ada
2020-02-21 10:21:50 +00:00
Simon MacMullen
d870d14c27 Merge changes from topic "log-anr-file-errors"
* changes:
  Add memory pressure information to ANR and system server watchdog.
  Log to dropbox if we fail to create an ANR stack trace file.
2020-02-21 10:13:19 +00:00
Charles Chen
80e6b0a183 Merge "Handle config/display changes for WindowContext" 2020-02-21 10:10:58 +00:00
Suprabh Shukla
1b6ce9ec76 Merge "Let admin block suspend in some cases" 2020-02-21 10:02:06 +00:00
Automerger Merge Worker
11c3205f05 Merge "Remove useless thread checks" am: 269d32a0fa am: c53b4accde
Change-Id: I7a1fe60971b733cb6bc3c848eeed8624210d97ff
2020-02-21 10:00:45 +00:00
Chiachang Wang
96ca8e9fff Use exposed permission defintion in Tethering
The permissions are checked by Tethering; mainline modules should be
able to do permission checks based on these permissions.

Bug: 135411507
Test: m
Change-Id: Ib7f2aedfaaa909bbc356196114c62af9345f2593
2020-02-21 17:50:18 +08:00
Automerger Merge Worker
c53b4accde Merge "Remove useless thread checks" am: 269d32a0fa
Change-Id: I1dc9ce4e5ef5ca2012264fdb736606a36f20c8a3
2020-02-21 09:37:21 +00:00
Chalard Jean
96726bcbb9 Revert "[NS D01] Remove candidates that don't satisfy the request."
This reverts commit 48c3f95878.

Reason for revert: The feature was punted out of R.

Change-Id: Ia91b3b3c55f735dae64ffa3194614a6f2631a087
2020-02-21 09:29:00 +00:00
Chalard Jean
9bcd42255b Revert "[NS D02] Mix in the ignore on wifi policy."
This reverts commit 14af825dbe.

Reason for revert: The feature was punted out of R.

Change-Id: Id9ecdac5292eeddf7c12f2330421248b0f8355a9
2020-02-21 09:28:18 +00:00
Chalard Jean
33834771a3 Revert "Address comments on ag/10316753"
This reverts commit 78b6667292.

Reason for revert: Feature punted

Change-Id: I4b17d1b186369f2ecfcecf4906cd2b99a66bc7a0
2020-02-21 09:28:00 +00:00
TreeHugger Robot
ea415c01c1 Merge changes Id6f54480,I7f18a560
* changes:
  Don't re-order users in the lock screen / quick settings user switcher.
  Mark/unmark activated state before the user switch begins.
2020-02-21 09:26:15 +00:00
Ben Murdoch
4658080acc Don't re-order users in the lock screen / quick settings user switcher.
Keep the position of users static to reduce (perceived) jank of user
switching.

Bug:146426568
Test: Manual
Change-Id: Id6f544803531ee2121d885909f88f907c3bb4957
2020-02-21 09:24:03 +00:00
Ben Murdoch
b7c16ecf03 Mark/unmark activated state before the user switch begins.
This makes the screen freeze appear more fluid while switching users.

Bug: 146426568
Test: Manual
Change-Id: I7f18a560ce00c9037b182db1a5fc546480c43d91
2020-02-21 09:23:56 +00:00
Charles Chen
d90bc26a07 Exempt-From-Owner-Approval: Workaround for build break on WifiNl80211Manager
Test: build pass
Bug: 149969343
Change-Id: I11c981a6e743f1f3b1f5c7581fdc851d81904322
2020-02-21 09:23:21 +00:00
Treehugger Robot
269d32a0fa Merge "Remove useless thread checks" 2020-02-21 09:22:15 +00:00
TreeHugger Robot
f748ca137e Merge changes from topic "revert-10338939-YCRBMILGZV"
* changes:
  Revert "[NS D03] Migrate the bad wifi avoidance policy"
  Revert "[NS D04] Implement a simple speed comparison between scores."
2020-02-21 08:51:09 +00:00
Andrii Kulian
02c0e4d2ac Handle config/display changes for WindowContext
Introduce IWindowToken to report config/display changes from
server side. When config change callback is received,
it will update the resources associated with the window token.

Test: WindowContextTests
Bug: 128338354
Bug: 146820733

Change-Id: I871bd78a21dbde1286786e65c340b6259b873660
2020-02-21 16:07:32 +08:00
Chalard Jean
66257d5cb8 Remove useless thread checks
Because we liked to be really sure.

Test: ConnectivityServiceTests
Change-Id: I8d66257777d4c5b6ca097a5f2575d0872fae05dd
2020-02-21 17:00:49 +09:00
TreeHugger Robot
80c2e07e00 Merge changes from topic "revert-10343065-HRWTWGOFZV"
* changes:
  Revert "[NS D05] Rework how to tear down networks"
  Revert "[NS D06] Implement more policies"
  Revert "[NS D07] Use the unmodified legacy score"
2020-02-21 07:53:30 +00:00
Bill Lin
9ae18fa2d9 DO NOT MERGE Respect rounded.xml size in ScreenDecorations
Suppose vendors will customize rounded.xml with corresponding
multiple radius path and size, ScreenDecorations should not resize it
by rounded_corner_radius in case jagged edges problem

Test: atest SystemUITests
Test: atest ScreenDecorationsTest
Bug: 145707162
Bug: 148912090
Change-Id: Ie33526214072ad324ca00a10074ad212dfbf4258
2020-02-21 07:46:18 +00:00
TreeHugger Robot
e7701cd8e7 Merge "Revert "Query to SystemProperties for BLAST Flag"" 2020-02-21 07:30:47 +00:00
TreeHugger Robot
cfeee925de Merge "Do not verify display context in DecorContext constructor" 2020-02-21 07:29:46 +00:00
Andrii Kulian
f753ea6cd6 Do not verify display context in DecorContext constructor
Non-activity context can be passed to DecorContext, so an exception
can be thrown when Context#getDisplay() call does verification.
An example is that a free dialog uses Application context as its context.

Bug: 149928768
Test: manual: test crashed apps reported in bugs before/after this patch.
Change-Id: Ib302c23cb8e2e388e7468f37f1b63b83ef52ef0e
2020-02-21 07:29:11 +00:00
Shawn Lin
46af143476 Merge "Allow passing cutout to the hierarchy in shortEdge mode" 2020-02-21 07:20:30 +00:00
Miranda Kephart
ac6507d7a4 Turn screenshot corner flow on for droidfood
Bug: 147424031
Test: manual
Change-Id: I608d30fa38390ba772c24744398689aa40ef7a01
2020-02-21 02:15:41 -05:00
Automerger Merge Worker
51a24c8ac1 [automerger skipped] Merge "Dynamically include ike-stubs in services.core.unboosted" am: 1586327498 am: 00255195fc am: 510534da2c -s ours
am skip reason: Change-Id I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5 with SHA-1 24c8c12926 is in history

Change-Id: Ieeefefbd3931ce2bf9b030f8a5548bf83b87ba88
2020-02-21 06:57:32 +00:00
Hyundo Moon
20886b9210 Merge "Add javadoc for the difference between transfer and select" 2020-02-21 06:47:51 +00:00
Chalard Jean
5845d54106 Revert "[NS D03] Migrate the bad wifi avoidance policy"
Revert submission 10338939

Reason for revert: The feature was punted out of R.
Reverted Changes:
I32c12702c:[NS D04] Implement a simple speed comparison betwe...
I688593cc0:[NS D03] Migrate the bad wifi avoidance policy

Change-Id: I640635a1ed94bed3b53466abe2a988caf0eca2b0
2020-02-21 06:47:35 +00:00
Chalard Jean
4bdb2cf7a0 Revert "[NS D04] Implement a simple speed comparison between scores."
Revert submission 10338939

Reason for revert: The feature was punted out of R.
Reverted Changes:
I32c12702c:[NS D04] Implement a simple speed comparison betwe...
I688593cc0:[NS D03] Migrate the bad wifi avoidance policy

Change-Id: I28172721d3f3af82ac79ef2c8f61df39943d997b
2020-02-21 06:46:06 +00:00
Automerger Merge Worker
510534da2c Merge "Dynamically include ike-stubs in services.core.unboosted" am: 1586327498 am: 00255195fc
Change-Id: I52aca89b368ec88bb837179aaba43f96bebcea77
2020-02-21 06:45:57 +00:00
Tiger Huang
4fd8cb5089 Merge "Adjust LayoutParams after handling soft input mode" 2020-02-21 06:35:22 +00:00
Automerger Merge Worker
00255195fc Merge "Dynamically include ike-stubs in services.core.unboosted" am: 1586327498
Change-Id: Ief6e7d683a39233302773a002f49df6368fb03f5
2020-02-21 06:33:53 +00:00
Automerger Merge Worker
ce28526727 Merge "Fix VerificationActivity Intent" am: b2d41e93f8 am: 4579ab30c3 am: b413552915
Change-Id: Iab05236faca240776acedba62ca3071e8ad20f6e
2020-02-21 06:32:57 +00:00
Yan Yan
1586327498 Merge "Dynamically include ike-stubs in services.core.unboosted" 2020-02-21 06:22:48 +00:00
evitayan
78ed90270a Dynamically include ike-stubs in services.core.unboosted
Previously because compilation will preferentially uses the
ike-stubs statically included in framework.jar,
FrameworksIkeTests has to jarjar the ike_test.jar. Otherwise
the tests will use the ike-stubs and cannot access to the hidden
implementation.

This commit removes ike-stubs in framework-minus-apex and framework
and statically includes it in services.core.unboosted.

In this way, system server can still compile against ike.jar and
at the same time FrameworksIkeTests does not need to jarjar the
ike_test.jar anymore

Bug: 145995723
Test: build, flash, boot, loaded in system server
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Change-Id: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
Merged-In: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
2020-02-21 06:22:12 +00:00
Automerger Merge Worker
b413552915 Merge "Fix VerificationActivity Intent" am: b2d41e93f8 am: 4579ab30c3
Change-Id: I52ae362254044c43ab3262ebd511d646da4861b5
2020-02-21 06:21:19 +00:00
TreeHugger Robot
cb7d86d8d1 Merge "Better overflow button" 2020-02-21 06:20:18 +00:00
Les Lee
427a30c8f7 Merge "wifi: Use long to replace int for softap feature set" 2020-02-21 06:07:13 +00:00
Automerger Merge Worker
4579ab30c3 Merge "Fix VerificationActivity Intent" am: b2d41e93f8
Change-Id: Ie9e153c83afae642e7322c27a1f7e179ab1575e6
2020-02-21 06:05:00 +00:00
Treehugger Robot
b2d41e93f8 Merge "Fix VerificationActivity Intent" 2020-02-21 05:51:24 +00:00
Automerger Merge Worker
37c514c097 [automerger skipped] Merge changes from topic "adbwifi-base" am: 458a9a2561 am: bdf898ab9f am: f098be9927 -s ours
am skip reason: Change-Id If3abca8e77381d6832f55d55a43c52ee1a1267d1 with SHA-1 2076c04333 is in history

Change-Id: I63aa064743e657d78f665ec6da9c1d4fb428b9f2
2020-02-21 05:47:00 +00:00