Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
565,031 Commits 3 Branches 0 Tags
fed4ec6ff6d832611461cb7c487c8ae3adafb1fa
Commit Graph

565031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
fed4ec6ff6 Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23cce279f53babac5b90364dd4fc0e55eb382dfa
 2021-03-02 19:22:34 +00:00
Lucas Lin
c4432db9e9 Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746
 2021-03-02 19:13:55 +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
Chiachang Wang
0d7553b30e Merge changes Ifc561b6d,I63137b24 
* changes:
  Remove RouteInfo hidden depdendency in NMS
  Remove the hidden ConnectivityManager dependency in NMS
 2021-03-02 05:13:22 +00:00
Lucas Lin
67ba0bc206 Merge changes I06ab0f2d,I8b146aa1 
* changes:
  Use UserHandle#getIdentifier to get the userid
  Add test for getStartUser(), getEndUser() and createForUser()
 2021-03-02 04:13:32 +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
lucaslin
6e09f2a6ce Use UserHandle#getIdentifier to get the userid 
UidRange uses PER_USER_RANGE to calculate and get the userid,
but PER_USER_RANGE is a hidden API, so use getIdentifier to get
the userid instead.

Bug: 170598012
Test: atest FrameworksNetTests:UidRangeTest
Change-Id: I06ab0f2da8a33d2b718bbc3a609d3d6a5fe0a095
 2021-03-02 02:21:39 +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
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
Yan Yan
6a6a6349a7 Merge "Support converting IkeTrafficSelector to/from PersistableBundle" 2021-03-01 22:31:24 +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
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
Shuo Qian
b7cc3c6106 Merge "Companion InCallService API review" 2021-03-01 16:46:36 +00: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
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
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
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
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
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
Julien Desprez
f9e2a9c55a Merge "attempt to run protologtool-tests as unit tests" 2021-02-27 00:41:48 +00:00
Connor O'Brien
9267c31a1c Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06a3a499afba0b7a20b8b474393aa68cffb4fd23
 2021-02-27 00:23:21 +00:00
Connor O'Brien
a0bbd188e4 Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" 2021-02-27 00:04:47 +00:00
Christian Wailes
76348ffadf Merge "Add LocalManagerRegistry inside system server." 2021-02-26 23:26:38 +00:00
Brad Ebinger
f92683b7d1 Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" am: 44d6bdc332 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62579792679ebb079d9fd2f97720a66d1d5aec3f
 2021-02-26 20:54:10 +00:00
Evgenii Stepanov
ac811c4025 Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." am: d600f5067a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c84f162736af927f6cac041f4200dc3ab2b8efa
 2021-02-26 20:50:30 +00:00
Brad Ebinger
44d6bdc332 Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" 2021-02-26 20:45:18 +00:00
Evgenii Stepanov
d600f5067a Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." 2021-02-26 20:11:10 +00:00
Suren Baghdasaryan
355bd7d9b8 Merge "Fix total memtrack Graphics and GL calculations" am: d061730dae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b6ebf686a92e6f2dd00691e5d2d4900dd871c99
 2021-02-26 19:02:10 +00:00
Treehugger Robot
b05555721c Merge "Rename the font file with PostScript name based file name" am: 5cc4c3ff91 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606551

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I489457c48373a037712c67363d5a1dd8597c0bf6
 2021-02-26 18:59:15 +00:00
Suren Baghdasaryan
d061730dae Merge "Fix total memtrack Graphics and GL calculations" 2021-02-26 18:59:10 +00:00
Suren Baghdasaryan
1ec9894cd6 Fix total memtrack Graphics and GL calculations 
Some execution paths do not account memtrack reported Graphics and GL
values in the calculations of memtrack total memory consumption.
Fix this by adding the missing parts.

Bug: 174546244
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I77f06322fbb06ffa33115c1469aba80e59247904
Merged-In: I77f06322fbb06ffa33115c1469aba80e59247904
 2021-02-26 18:59:01 +00:00
Hunter Knepshield
b79c80ba78 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0c2b746e1be4944a6caa05c6764f37cf960bace
 2021-02-26 18:52:56 +00:00
Treehugger Robot
5cc4c3ff91 Merge "Rename the font file with PostScript name based file name" 2021-02-26 18:38:22 +00:00
Winson Chiu
b87d41ab87 Merge "Add OWNERS for pm.verify.domain" am: 1736ad8bfe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cc5663bb712bcf4f8a2fd8c6a335bc5a4a50946
 2021-02-26 18:36:42 +00:00
Hunter Knepshield
39742a519c Merge "[API review] Additional detail in BugreportCallback javadoc." 2021-02-26 18:31:22 +00:00
Winson Chiu
1736ad8bfe Merge "Add OWNERS for pm.verify.domain" 2021-02-26 17:49:47 +00:00
Andrei-Valentin Onea
0f53ddc205 Merge "Fix deadlock on CompatConfig.mChanges" am: eaf3fd59ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3b58c1aa33e9ff8692370e701d258b391eb563e
 2021-02-26 16:58:48 +00:00
Andrei-Valentin Onea
eaf3fd59ff Merge "Fix deadlock on CompatConfig.mChanges" 2021-02-26 16:26:21 +00:00
Vladimir Marko
e70dab7633 Merge "Change dirty-image-objects file format." am: 523e3b9b79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606454

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5641323dfc73d02993a3904596330743df209d34
 2021-02-26 11:33:57 +00:00
Junyu Lai
32e8e9eb24 Merge "[FUI08] Create NeworkStateSnapshot" am: 702ca13a66 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6f0e981228ef886496f55626b499f9c487af320
 2021-02-26 11:30:53 +00:00