Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
689,994 Commits 3 Branches 0 Tags
09c4cacde8a607972d9c220ea55233de22fbdb2e
Commit Graph

689994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
09c4cacde8 Merge changes from topic "presubmit-am-3c67dfb7daa54b3fa6c841b48ca2ab1a" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d988d842e8
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:16:52 +00:00
TreeHugger Robot
2a1f6e2aa2 Merge changes from topic "presubmit-am-b69d09d5878144668fcbe6a339c561a4" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 61213e84fd
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:16:38 +00:00
TreeHugger Robot
29fca3751a Merge changes from topic "presubmit-am-4dd661b2712141e4ad7e71f9634e6b14" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f72bf997b6
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:15:13 +00:00
Sudheer Shanka
afbfc9f7ec Merge "Check if app's ntwk state will be changed before updating procstate." am: 36b9bc8e4b am: a27cba0c10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030427

Change-Id: I007a7c1c16b9fab62d1e24b37fe6dfdd1767d3d7
 2022-03-18 01:48:23 +00:00
Sudheer Shanka
a27cba0c10 Merge "Check if app's ntwk state will be changed before updating procstate." am: 36b9bc8e4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030427

Change-Id: I01f44b56e76b087ed4ce3a5186e20a88b162e952
 2022-03-18 01:20:59 +00:00
Sudheer Shanka
36b9bc8e4b Merge "Check if app's ntwk state will be changed before updating procstate." 2022-03-18 00:55:05 +00:00
Eric Biggers
071a3b1820 Merge "Remove support for converting from FDE to FBE" am: 855ec2d31a am: 6a72370d4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027583

Change-Id: I07ed4132c24152febfa4c2ae323594452953f043
 2022-03-17 22:42:57 +00:00
Eric Biggers
6a72370d4b Merge "Remove support for converting from FDE to FBE" am: 855ec2d31a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027583

Change-Id: If0a50e1b1f4727971d8f97dbaba8e456aa3092e2
 2022-03-17 22:19:14 +00:00
Eric Biggers
855ec2d31a Merge "Remove support for converting from FDE to FBE" 2022-03-17 21:59:32 +00:00
Suprabh Shukla
8a915e5042 [automerger skipped] Merge "Listening to package broadcast on all users" into sc-v2-dev am: ef0d4a69ed -s ours 
am skip reason: Merged-In I1f1b9a5b8f63d6564c9e121bee7d6d6d697b471d with SHA-1 da731460df is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17208490

Change-Id: I3a8a64d5ddd09c98cecd18911d0d1685d85cce4d
 2022-03-17 21:41:27 +00:00
Suprabh Shukla
c957708179 Merge changes from topic "presubmit-am-98af38b71a6140d09aa6a8963d386ea8-sc-v2-dev" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Listening to package broadcast on all users 2p: da731460df
  Listening to package broadcast on all users
 2022-03-17 21:25:00 +00:00
Suprabh Shukla
ef0d4a69ed Merge "Listening to package broadcast on all users" into sc-v2-dev 2022-03-17 21:25:00 +00:00
Yuri Lin
dd20ad2a12 [automerger skipped] Merge "Small improvements to matchesCallFilter functionality" into sc-v2-dev am: 2a54e74ec3 -s ours 
am skip reason: Merged-In I29c39bf1e3d7dc69cc1f83854a23f6b33a6eac58 with SHA-1 62a8ebb5a8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17221226

Change-Id: I1e3f71486f2d9553b91627f2dae4b6b168502040
 2022-03-17 17:35:55 +00:00
Yuri Lin
2a54e74ec3 Merge "Small improvements to matchesCallFilter functionality" into sc-v2-dev 2022-03-17 17:03:07 +00:00
Yuri Lin
8d774bfdd3 Merge changes from topic "presubmit-am-cc33c9de596c45a48f23d05bd8cbad1a" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Small improvements to matchesCallFilter functionality 2p: 62a8ebb5a8
  Small improvements to matchesCallFilter functionality
 2022-03-17 17:03:07 +00:00
Sudheer Shanka
39da7d1c23 Check if app's ntwk state will be changed before updating procstate. 
We check previous set procstate and the current procstate in the
UidRecord to see if the app's network access state is going to be
changed and so it needs to be done before we change the setProcstate
in the UidRecord.

Bug: 224438257
Bug: 218308105

Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I0f3a4ca18cd889f49e3e3651799c3c14f9c2e218
 2022-03-17 16:49:35 +00:00
Quentin Perret
1ca48e50df Merge "Revert "Change Ethernet API to use OutcomeReceiver"" am: 8efc170b0b am: 968846563b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030086

Change-Id: I6cc814b78b88310830048fa3cb8d87724ebb7460
 2022-03-17 16:29:29 +00:00
Quentin Perret
968846563b Merge "Revert "Change Ethernet API to use OutcomeReceiver"" am: 8efc170b0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030086

Change-Id: Iccac1e57a95a1de31b635039b9b6db80fecac5b1
 2022-03-17 15:57:11 +00:00
Quentin Perret
8efc170b0b Merge "Revert "Change Ethernet API to use OutcomeReceiver"" 2022-03-17 15:26:19 +00:00
Felipe Leme
38b665b8bc Merge "Changes TimingsTraceLog and TimingsTraceAndSlog to be less spammy." into sc-v2-dev am: bc8c3fd68b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144854

Change-Id: I373ad7f9d3286618af455b30639fc2b4c7ff3729
 2022-03-17 15:23:36 +00:00
Quentin Perret
0251301278 Revert "Change Ethernet API to use OutcomeReceiver" 
Revert "Change network management listener to outcome receiver"

Revert submission 2028203-ethernet-outcomereceiver

Reason for revert: BuildMonitor investigating b/225169800
Reverted Changes:
I4c204a848:Change Ethernet API to use OutcomeReceiver
I7c46545a4:Change Ethernet API to use OutcomeReceiver
Id8fadfed9:Change network management listener to outcome rece...

Change-Id: I45af594f7233ed89113f4cf7f977092271980672
 2022-03-17 15:20:53 +00:00
Felipe Leme
bc8c3fd68b Merge "Changes TimingsTraceLog and TimingsTraceAndSlog to be less spammy." into sc-v2-dev 2022-03-17 14:55:48 +00:00
Felipe Leme
88bf26bf37 Merge changes from topic "presubmit-am-67f791696fed41829026111e0282dce4" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Changes TimingsTraceLog and TimingsTraceAndSlog to be less spammy. 2p: bd3271d162
  Changes TimingsTraceLog and TimingsTraceAndSlog to be less spammy.
 2022-03-17 14:55:48 +00:00
Chris Li
dcd66a376f Merge "[DO NOT MERGE] ActivityEmbedding: hide embedded TaskFragment between adjacent TFs" into sc-v2-dev am: c48dfe548b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17202427

Change-Id: I18724f503df217fa7160a5e05144f274bf7a81bb
 2022-03-17 14:50:33 +00:00
Patrick Rohr
417bfa93b2 Merge "Change Ethernet API to use OutcomeReceiver" am: a7b1911815 am: fd9b76cc50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028164

Change-Id: I8edb5f982d6f48cff87b99874d3d6b52833f4779
 2022-03-17 14:50:12 +00:00
Chris Li
c48dfe548b Merge "[DO NOT MERGE] ActivityEmbedding: hide embedded TaskFragment between adjacent TFs" into sc-v2-dev 2022-03-17 14:26:59 +00:00
Patrick Rohr
fd9b76cc50 Merge "Change Ethernet API to use OutcomeReceiver" am: a7b1911815 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2028164

Change-Id: I03793f5a79fc869b5ddcd28b1fdc22c496359e63
 2022-03-17 14:18:32 +00:00
Patrick Rohr
a7b1911815 Merge "Change Ethernet API to use OutcomeReceiver" 2022-03-17 13:53:18 +00:00
Presubmit Automerger Backend
ac6b3c86e7 [automerge] [DO NOT MERGE] ActivityEmbedding: hide embedded TaskFragment between 2p: 906689084a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17202427

Change-Id: I1a2a659de3e97b76cd36258401c05213179fdd6c
 2022-03-17 12:05:58 +00:00
Chris Li
906689084a [DO NOT MERGE] ActivityEmbedding: hide embedded TaskFragment between 
adjacent TFs

An old secondary TaskFragment can be in middle of the primary and new
secondary TaskFragments. We don't want to show it even if it has a
different bounds from the new secondary.

Fix: 215467839
Test: atest SplitActivityLifecycleTest
Change-Id: I85dccdc4a931eda7d53c91d288ad19b6ef865dc9
 2022-03-17 12:05:38 +00:00
Automerger Merge Worker
a49b347f57 Merge "Merge "ActivityEmbedding: launch into the same side container" into sc-v2-dev am: 53c2f64d1e" into sc-v2-dev-plus-aosp 2022-03-17 10:59:52 +00:00
Chris Li
1d2ae36002 Merge "ActivityEmbedding: launch into the same side container" into sc-v2-dev am: 53c2f64d1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17197564

Change-Id: Ifc68f2ca2f996a2dc82eb8ad44e7fa5a6fd3a934
 2022-03-17 10:59:20 +00:00
Etienne Ruffieux
520a6e5a9b Merge "[API Review] Replace usage of getUuids by new SystemApi" am: e2b00d3a7d am: 1de1157d4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020438

Change-Id: Ie10cd534ac9a245903c1674445ef9eb17de97daf
 2022-03-17 10:59:16 +00:00
Chris Li
53c2f64d1e Merge "ActivityEmbedding: launch into the same side container" into sc-v2-dev 2022-03-17 10:33:42 +00:00
Chris Li
2638f38f75 Merge changes from topic "presubmit-am-97f49dd1a76949539332751ae071ebdc" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] ActivityEmbedding: launch into the same side container 2p: d530d65cfa
  ActivityEmbedding: launch into the same side container
 2022-03-17 10:33:42 +00:00
Etienne Ruffieux
1de1157d4e Merge "[API Review] Replace usage of getUuids by new SystemApi" am: e2b00d3a7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020438

Change-Id: Ic33a98c771788a08938012fef1f82cc19c69de35
 2022-03-17 10:26:52 +00:00
Etienne Ruffieux
e2b00d3a7d Merge "[API Review] Replace usage of getUuids by new SystemApi" 2022-03-17 09:44:51 +00:00
Jason Chang
82c632df08 Merge "[DO NOT MERGE] Fix unexpectedly NPE on CF when calling mDevice.getProductName()" into sc-v2-dev am: 5581402d22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17216149

Change-Id: I4d37c7ff96a7640e47beaa172de040f667e8063c
 2022-03-17 09:20:02 +00:00
Jason Chang
5581402d22 Merge "[DO NOT MERGE] Fix unexpectedly NPE on CF when calling mDevice.getProductName()" into sc-v2-dev 2022-03-17 08:40:20 +00:00
Jason Chang
ea33988637 Merge changes from topic "presubmit-am-388f21e202994dfcb871fff05c757ba6" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [DO NOT MERGE] Fix unexpectedly NPE on CF when calling 2p: 50a858875e
  [DO NOT MERGE] Fix unexpectedly NPE on CF when calling mDevice.getProductName()
 2022-03-17 08:40:20 +00:00
Chris Li
a8cd5cb32f Merge "Offset animation layer for TaskFragment open/close" into sc-v2-dev am: 4f7c64085f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17197127

Change-Id: I5f7327d7f5f0cbde9979b3e3f6daf0898c7bf725
 2022-03-17 08:13:57 +00:00
Patrick Rohr
b004538113 Merge "Add Nullable IpConfiguration to ethernet update request" am: bc1479af8f am: 3c088fc9cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025283

Change-Id: I16fab89269d4b689405e62a169f378373782b396
 2022-03-17 07:43:02 +00:00
Patrick Rohr
eea9edf76d Change Ethernet API to use OutcomeReceiver 
This change addresses API review feedback. In addition, it changes the
returned result from Network to the interface name. The current API
returning a Network object is racy and cannot be implemented correctly.
Users should instead use the ConnectivityManager#requestNetwork() API to
get hold of the Network for a given interface.

Bug: 220017952
Test: TH
Change-Id: I7c46545a47034be409071c2ec007d9e1480c6ed0
 2022-03-17 08:20:45 +01:00
Chris Li
4f7c64085f Merge "Offset animation layer for TaskFragment open/close" into sc-v2-dev 2022-03-17 07:09:34 +00:00
Chris Li
2cba198030 Merge changes from topic "presubmit-am-d4dc4c006a0c45528e886e4f5c7b20d6-sc-v2-dev" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Offset animation layer for TaskFragment open/close 2p: 06617390e3
  Offset animation layer for TaskFragment open/close
 2022-03-17 07:09:34 +00:00
Patrick Rohr
3c088fc9cf Merge "Add Nullable IpConfiguration to ethernet update request" am: bc1479af8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025283

Change-Id: I198fac5840238cf5e5d02b7a0305614ab7d41622
 2022-03-17 07:03:43 +00:00
Presubmit Automerger Backend
f721b5fc1b [automerge] [DO NOT MERGE] Fix unexpectedly NPE on CF when calling 2p: 50a858875e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17216149

Bug: 224685744
Bug: 224627240
Change-Id: Ia36ebbd31829e9e33d8fd559d228e139e63e679e
 2022-03-17 06:51:58 +00:00
Jason Chang
50a858875e [DO NOT MERGE] Fix unexpectedly NPE on CF when calling 
mDevice.getProductName()

Move the mDevice.getProductName() into mDevice NPE check condition.

Bug: 224685744
Bug: 224627240

Test: manually install NeutronPlayer to test usb audio device
permission warning dialog sentence.
Test: atest SystemUITests
Test: atest com.android.systemui.usb
.UsbPermissionActivityTest#testHideNonSystemOverlay

Change-Id: Ic5fecc1e98072eda6dcc48a3adc669ef731a4c9c
 2022-03-17 14:48:19 +08:00
Patrick Rohr
bc1479af8f Merge "Add Nullable IpConfiguration to ethernet update request" 2022-03-17 06:17:02 +00:00
SongFerng Wang
be4ecfc58e Merge "Add the API to get the AudioLocation" am: 919194578b am: 78d86dc33b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027930

Change-Id: I4293eb1b67ae754b0b5515309267651b9355a708
 2022-03-17 04:59:47 +00:00