Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
566,321 Commits 3 Branches 0 Tags
e5d40c1933e5eea709ede193960914b3aca5d68b
Commit Graph

566321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Lin
e5d40c1933 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51510ea705 am: 0fef75ee53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f6682b86e1e8d9899ea02320dd8de347e72c724
 2021-03-02 19:49:13 +00:00
Lucas Lin
0fef75ee53 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51510ea705 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia438f937106645eb0d6cb91772d437676bf716fd
 2021-03-02 19:08:57 +00:00
Remi NGUYEN VAN
045c615bb2 Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: 7152a8f376 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I774c494d6e0f136547cf9175abb6662fd106a6a3
 2021-03-02 18:46:39 +00:00
TreeHugger Robot
6725c98e08 [automerger skipped] Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master am: 8c99359559 -s ours 
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida26bd98bc676777ac1456dc663ed4ce72d10bb2
 2021-03-02 18:44:20 +00:00
Abhijeet Kaur
d41a537ed0 Merge "Removed unused mount mode constants" into rvc-qpr-dev-plus-aosp 2021-03-02 13:54:01 +00:00
Lucas Lin
51510ea705 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 
* changes:
  Fix comments left on aosp/1547454 and aosp/1556106
  Remove INetworkManagementService from ConnectivityService
  Remove unused INetworkManagementService
  Remove BaseNetworkObserver from Nat464Xlat
 2021-03-02 04:07:35 +00:00
Remi NGUYEN VAN
7152a8f376 Merge "Move QoS API classes to Connectivity" am: 32a606fe54 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idad1f51e7f269c2cef9e836efa668a5a0afd4c5a
 2021-03-02 01:28:59 +00:00
TreeHugger Robot
8c99359559 Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master 2021-03-02 01:09:08 +00:00
Remi NGUYEN VAN
32a606fe54 Merge "Move QoS API classes to Connectivity" 2021-03-02 00:36:47 +00:00
Yan Yan
768da4ffc0 Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 am: 029885f8c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I413a7801db110980b3da7147b2ce29c867a1d2fc
 2021-03-02 00:12:32 +00:00
Yan Yan
029885f8c7 Merge "Support converting IkeTrafficSelector to/from PersistableBundle" am: 6a6a6349a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I783ea3c7f9ab4b96e15297a8711876388786c81c
 2021-03-01 23:18:00 +00:00
Bob Badour
bcbfb51166 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into rvc-qpr-dev-plus-aosp 2021-03-01 23:17:42 +00:00
Yan Yan
6a6a6349a7 Merge "Support converting IkeTrafficSelector to/from PersistableBundle" 2021-03-01 22:31:24 +00:00
Shuo Qian
c9443c8964 Merge "Companion InCallService API review" am: b7cc3c6106 am: a63d125010 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52e18abe08b9258687e9a27b2e8e549cc6f39874
 2021-03-01 20:06:23 +00:00
Shuo Qian
a63d125010 Merge "Companion InCallService API review" am: b7cc3c6106 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib967a0256b39150a190dc4cb7b8b7f7a00d3fdd7
 2021-03-01 18:57:21 +00:00
Treehugger Robot
c16285c27c Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 19f7526c3e am: dc8de2ce5a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1609976

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf02c4122be0d2c0b7fd2d530adc891e06a5f0b7
 2021-03-01 18:44:09 +00:00
Collin Fijalkovich
fb633ef937 Merge "Avoid TransferPipe for local dumpCacheInfo calls" into rvc-qpr-dev am: d8c231ef99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13701625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45b840db0568687282de097e1e43a0a83e5176f0
 2021-03-01 18:23:26 +00:00
Collin Fijalkovich
d8c231ef99 Merge "Avoid TransferPipe for local dumpCacheInfo calls" into rvc-qpr-dev 2021-03-01 18:05:49 +00:00
Heemin Seog
3ad96cbfe1 Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev am: de0869335a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01f2dcbbb43e75cecf7d21dd9967b07087aa8a55
 2021-03-01 18:01:59 +00:00
Heemin Seog
c76299428e DO NOT MERGE Intercept back button on user switcher screen am: a287650f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf68c025d3fab83724ed802fd99826668cf81bf3
 2021-03-01 18:01:41 +00:00
Treehugger Robot
dc8de2ce5a Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 19f7526c3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1609976

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f84b0a5fc4caf145470eb136efacc497a6661e4
 2021-03-01 17:42:26 +00:00
Heemin Seog
de0869335a Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev 2021-03-01 17:28:20 +00:00
TreeHugger Robot
0a66a75b91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1e3abbf022 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3da87a730af4b63b72948c4a277db06e82439c00
 2021-03-01 17:23:38 +00:00
TreeHugger Robot
1e3abbf022 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-01 16:48:23 +00:00
Shuo Qian
b7cc3c6106 Merge "Companion InCallService API review" 2021-03-01 16:46:36 +00:00
Bob Badour
0bae5abe8f [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  location/tests/Android.bp
  services/api/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id37aaf0fe274dd89446bacdf8d719ec2dc6699c6
 2021-03-01 08:41:36 -08:00
Treehugger Robot
19f7526c3e Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-03-01 16:25:43 +00:00
Bob Badour
a830943f6c [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 
Added SPDX-license-identifier-Apache-2.0 to:
  location/tests/Android.bp
  services/api/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I823e093d400903202e5535188639dddd1a1f78a9
Merged-in: I823e093d400903202e5535188639dddd1a1f78a9
 2021-03-01 15:25:02 +00:00
Remi NGUYEN VAN
3550d4bab5 Move QoS API classes to Connectivity 
The classes were added in S and are used to back ConnectivityManager
APIs. Add them to the connectivity boundary as they belong together with
ConnectivityManager.

Bug: 181512874
Test: m
Change-Id: I03b5978949b200a72813d1ebc4812d851fe3df37
 2021-03-01 18:09:30 +09:00
Xin Li
4bbe2a2df3 Merge RQ2A.210305.007 into stage. 
Bug: 180401296
Merged-In: I1a16808426934f4a8d12410576d769443e4c2a04
Change-Id: I247a99c33c62cd1d000b7e50d1dda8b14df229d7
 2021-03-01 01:06:43 -08:00
Xin Li
61c81af99a [automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 80d1724769 -s ours 
am skip reason: Change-Id Id1351d1d694e96564317e12c79a2484fd33f762e with SHA-1 a49208f178 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2912b4d3c8e608139d49ea2739878e4f4775a5ab
 2021-03-01 09:03:27 +00:00
Lorenzo Colitti
2479f01e8d Merge "Delete the last remaining user of TestNetworkStackLib." am: 6a01b8d23b am: a49208f178 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibef70ffb262f8446348ae7cc1cb7fd61a089a007
 2021-03-01 09:02:33 +00:00
Xin Li
80d1724769 DO NOT MERGE - Mark RQ2A.210105.001 as merged. 
Bug: 180401296
Merged-In: Id1351d1d694e96564317e12c79a2484fd33f762e
Change-Id: Ifa2323c69b4f72fb02aeb4330dbbe12b3ddcd172
 2021-03-01 00:43:22 -08:00
Bill Yi
be333346b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I45f5d57fe0b27b6b103c6af8f6941d6a0f36005e
 2021-03-01 08:25:12 +00:00
Lorenzo Colitti
a49208f178 Merge "Delete the last remaining user of TestNetworkStackLib." am: 6a01b8d23b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1351d1d694e96564317e12c79a2484fd33f762e
 2021-03-01 08:11:39 +00:00
Lorenzo Colitti
6a01b8d23b Merge "Delete the last remaining user of TestNetworkStackLib." 2021-03-01 07:47:47 +00:00
Lorenzo Colitti
55d9c5a693 Delete the last remaining user of TestNetworkStackLib. 
FrameworksNetIntegrationTests is the last user of this target.
It is not really necessary since it can trivially be replaced by
NetworkStackApiStableLib.

Bug: 167645754
Test: atest FrameworksNetIntegrationTests
Change-Id: Id5e8eb3f58590f4b3cfbcbef66b00acbba77a7a7
 2021-03-01 15:12:53 +09:00
Remi NGUYEN VAN
51b9ccb115 Merge "Split out the connectivity API surface" am: 3d31f1ead0 am: 587784cd4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iced065c53194f4c5bd54198e05ddc455a97ba50e
 2021-03-01 02:25:13 +00:00
Remi NGUYEN VAN
587784cd4c Merge "Split out the connectivity API surface" am: 3d31f1ead0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e51465cfeab43ff5f154771e2e22a7cd981d066
 2021-03-01 02:10:04 +00:00
Remi NGUYEN VAN
3d31f1ead0 Merge "Split out the connectivity API surface" 2021-03-01 01:07:19 +00:00
Rajeev Kumar
0458084833 Merge "Add basic dumping to AppHibernationService" am: 8596c6e90e am: a395f61ed5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597057

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia48135ef98c1c849ba7a4473e557b1ad49b82c6f
 2021-02-28 17:48:25 +00:00
Rajeev Kumar
a395f61ed5 Merge "Add basic dumping to AppHibernationService" am: 8596c6e90e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597057

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I603e07b689562215c80fee47d68f9220f7da7396
 2021-02-28 17:03:07 +00:00
Rajeev Kumar
8596c6e90e Merge "Add basic dumping to AppHibernationService" 2021-02-28 16:04:10 +00:00
TreeHugger Robot
e4ca4bbc93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 05f68c26dd -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iecf56c7b5ac5ec6edbfa2eed12a4c103ab944b53
 2021-02-27 18:58:34 +00:00
TreeHugger Robot
05f68c26dd Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-27 17:53:47 +00:00
Bill Yi
a54a7bdaf6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie71cf9a1dcad53542775ce804fad1f879caa6d72
 2021-02-27 07:21:26 +00:00
Julien Desprez
3043de8cdd Merge "attempt to run protologtool-tests as unit tests" am: f9e2a9c55a am: 8ae5fd7f1c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601194

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49f25cdd28d45d453a96b416011d6fd4c65f54a5
 2021-02-27 01:34:53 +00:00
Connor O'Brien
fad30e4c7b Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 am: 9267c31a1c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7275e44e3f4cd090cf5c03e25a8b83a8acbbf26
 2021-02-27 01:05:46 +00:00
Christian Wailes
7f037415ea Merge "Add LocalManagerRegistry inside system server." am: 76348ffadf am: 4eb5f086d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75f5867f97f923e07286b798a7abffef502ebf8e
 2021-02-27 01:05:01 +00:00
Julien Desprez
8ae5fd7f1c Merge "attempt to run protologtool-tests as unit tests" am: f9e2a9c55a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601194

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ab6d11a665cc671eb22dda389ed44aa0366e343
 2021-02-27 01:01:29 +00:00