Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
618,351 Commits 3 Branches 0 Tags
4c5b52da8dd01dcc59d6a88243c28fd4e4a3df74
Commit Graph

618351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
4c5b52da8d Merge changes I3eb82680,I9d6147d9 am: bbd9fb5c27 am: c27bf45cb6 am: 54e08a027c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f0d6bfead295ed6a98a15ef9bb3542b88d5652a
 2021-01-13 00:50:46 +00:00
Treehugger Robot
dc4633ec83 Merge "Revert "OMS: add tests for the OMS transactional API"" am: 78a3fdfbed am: 55e40879e8 am: 77c94b84ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6aa33aa183bb845497b33922b13a4be25d7592b3
 2021-01-13 00:50:18 +00:00
Treehugger Robot
ee771f2d83 Merge "Revert "Push OverlayDeviceTests onto /system"" am: b294b8bc61 am: c0d6dea0fb am: 1d12360a9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71eb5e8389ae2e90af0d3eb01b2e4b878f51f9c4
 2021-01-13 00:49:49 +00:00
Lorenzo Colitti
54e08a027c Merge changes I3eb82680,I9d6147d9 am: bbd9fb5c27 am: c27bf45cb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a111bb928c5afd2cbbb15db503b60ef501ff2e0
 2021-01-13 00:49:30 +00:00
Treehugger Robot
48dec93d4a Merge "Revert "OMS: add transactional API"" am: 7facc4ec41 am: ba88e64636 am: c9d2ce70de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548437

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e88ddf57a29aeed73157801e29a8379f6bea79c
 2021-01-13 00:49:22 +00:00
Treehugger Robot
77c94b84ca Merge "Revert "OMS: add tests for the OMS transactional API"" am: 78a3fdfbed am: 55e40879e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83f0956b56a93fff302170997735450fa0adf087
 2021-01-13 00:49:02 +00:00
Treehugger Robot
1d12360a9e Merge "Revert "Push OverlayDeviceTests onto /system"" am: b294b8bc61 am: c0d6dea0fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bfc4304d0a230c15e011d0a2a456714bfefbf50
 2021-01-13 00:49:00 +00:00
Treehugger Robot
c9d2ce70de Merge "Revert "OMS: add transactional API"" am: 7facc4ec41 am: ba88e64636 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548437

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d5bf83f5d5ce2600084e4c2be28199ffe78db22
 2021-01-13 00:48:58 +00:00
Danny Epstein
3dd647305e [automerger skipped] Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev am: d77d372dc7 am: 3cbb779954 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37067cbba5101afe0c057ab20606c7a99c97d45a
 2021-01-13 00:48:48 +00:00
Danny Epstein
4dfd820998 [automerger skipped] DO NOT MERGE Focus clock by default am: ab6fd7362d am: 225530ba1c -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd62bdd5ed9b8d11704486896ef3c6bf79c69470
 2021-01-13 00:48:39 +00:00
Sooraj Sasindran
7055520b1e Merge changes from topic "cross-sim" 
* changes:
  Introduce IMS Cross SIM registration
  Cross SIM configuration API
 2021-01-13 00:47:01 +00:00
Lorenzo Colitti
c27bf45cb6 Merge changes I3eb82680,I9d6147d9 am: bbd9fb5c27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d65a0465729426fb038004cd80a15ca9e438b0e
 2021-01-13 00:34:09 +00:00
Danny Epstein
3cbb779954 Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev am: d77d372dc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13223231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3e2761489f5dd954d1e490f9d8b926e4f61e13
 2021-01-13 00:33:04 +00:00
Danny Epstein
225530ba1c DO NOT MERGE Focus clock by default am: ab6fd7362d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13223231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f55b1deacdfe520bf371f48c98d1e16b675cf77
 2021-01-13 00:32:45 +00:00
TreeHugger Robot
3462bcb4a5 Merge "Replace CDM profiles hardcoded strings with real values" 2021-01-13 00:32:04 +00:00
Lorenzo Colitti
bbd9fb5c27 Merge changes I3eb82680,I9d6147d9 
* changes:
  NetworkWatchlistServiceTests: update IIpConnectivityMetrics.
  Stop using IIpConnectivityMetrics in ConnectivityService.
 2021-01-13 00:31:56 +00:00
Treehugger Robot
55e40879e8 Merge "Revert "OMS: add tests for the OMS transactional API"" am: 78a3fdfbed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e78a895a3c245e9faf07ce166aaa662b4703d75
 2021-01-13 00:27:47 +00:00
Amy Zhang
cb3903f699 Merge "Refactor JNI to remove ITimeFilter/IDemux/ITuner" 2021-01-13 00:26:36 +00:00
Amy Zhang
46a09f9d4c Merge "Fully remove Frontend HAL from Tuner JNI and use Frontend Client instead" 2021-01-13 00:26:08 +00:00
Amy Zhang
c620093853 Merge "Refactor Tuner JNI and move the interaction with IDescrambler into DescramblerClient" 2021-01-13 00:24:22 +00:00
Amy Zhang
b81bacba5b Merge "Refactor Tuner JNI and move the interaction with ILnb into LnbClient" 2021-01-13 00:23:54 +00:00
Treehugger Robot
c0d6dea0fb Merge "Revert "Push OverlayDeviceTests onto /system"" am: b294b8bc61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie597d66089a2de256d8817269179c5426bc7d728
 2021-01-13 00:23:41 +00:00
Amy Zhang
a4125db127 Merge "Add Descrambler and Lnb Client interfaces" 2021-01-13 00:23:27 +00:00
Amy Zhang
e76dbfa1d4 Merge "Remove Lnb updating related implementation from Tuner JNI/java" 2021-01-13 00:23:09 +00:00
Danny Epstein
d77d372dc7 Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev 2021-01-13 00:20:19 +00:00
Treehugger Robot
ba88e64636 Merge "Revert "OMS: add transactional API"" am: 7facc4ec41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548437

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a7d5d6c65b5dd9531f155cc4403c8e5d2ed136b
 2021-01-13 00:16:39 +00:00
Treehugger Robot
78a3fdfbed Merge "Revert "OMS: add tests for the OMS transactional API"" 2021-01-13 00:00:42 +00:00
Treehugger Robot
b294b8bc61 Merge "Revert "Push OverlayDeviceTests onto /system"" 2021-01-13 00:00:42 +00:00
Treehugger Robot
7facc4ec41 Merge "Revert "OMS: add transactional API"" 2021-01-13 00:00:42 +00:00
Tomasz Wasilczyk
434593904c Merge "Keep Vehicle internal network always up" am: c353781098 am: e189a2466a am: dcc64b54fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3fad64a3a049e760f60a63b826c6f0d962309bb
 2021-01-12 23:47:18 +00:00
Ken Chen
b1481f1056 Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 am: fac52cd24b am: 3da4638c49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I159a4a4115f200e78bc368d9db2997c58d0858b8
 2021-01-12 23:46:44 +00:00
Daniel Bright
1fffaa0a4e Merge "Partial hal support for secondary link bandwidth" 2021-01-12 23:40:41 +00:00
Adam He
aaeac91a58 Merge "Register translation service." 2021-01-12 23:35:18 +00:00
Marco Ballesio
9b2cce77ed Merge "ActivityManager: don't freeze processes holding file locks" 2021-01-12 23:34:20 +00:00
Tomasz Wasilczyk
dcc64b54fc Merge "Keep Vehicle internal network always up" am: c353781098 am: e189a2466a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfb77d0632352c41629395fe4d8b546c593599ce
 2021-01-12 23:04:07 +00:00
Ken Chen
3da4638c49 Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 am: fac52cd24b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I792005c9abd7ccf6a0948330a32b2dcc07d51506
 2021-01-12 23:03:49 +00:00
Wale Ogunwale
f717288022 Merge changes from topic "reparentTasks" 
* changes:
  1/ Refactor LegacySplitScreenTests
  Support WCT#reparentTasks and WCT#setLaunchRoot
 2021-01-12 22:47:36 +00:00
Tomasz Wasilczyk
e189a2466a Merge "Keep Vehicle internal network always up" am: c353781098 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I486b4c9dd987dd94b4e4ca9d1f87fe58d9f9f51e
 2021-01-12 22:43:41 +00:00
Tomasz Wasilczyk
c353781098 Merge "Keep Vehicle internal network always up" 2021-01-12 22:40:50 +00:00
Kweku Adams
3af4228b4a Merge "Restrict calls to addPowerSaveTempWhitelistApp." 2021-01-12 22:40:23 +00:00
Ken Chen
fac52cd24b Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I867128ec2eddf494c8ff15e19c54733778d5eace
 2021-01-12 22:39:07 +00:00
TreeHugger Robot
57114c8b2c [automerger skipped] Merge "Fix the ambient lux which did not update for blocking zone" into rvc-qpr-dev am: 61b61e49ed am: 910b875440 -s ours 
am skip reason: Change-Id Ibf2e7cb2e336c88a583f00f59abcbc9d06ec3d62 with SHA-1 6d728c2b0f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I958365f957182c43027615fa3523e8161cfaa75d
 2021-01-12 22:24:17 +00:00
Ken Chen
191e2d3c39 Merge "Let ConnectivityService control the socket closure" 2021-01-12 22:23:59 +00:00
TreeHugger Robot
aeb59e0af4 Merge "Require INTERACT_ACROSS_USERS to enable readlogs." 2021-01-12 22:08:57 +00:00
TreeHugger Robot
910b875440 Merge "Fix the ambient lux which did not update for blocking zone" into rvc-qpr-dev am: 61b61e49ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13288650

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3c67929da76d462dfb42df1bcbc406388930278
 2021-01-12 22:08:35 +00:00
Kevin Chyn
f4abdc48df Merge "3/n: Add most remaining plumbing for authenticatorId invalidation" 2021-01-12 22:01:01 +00:00
TreeHugger Robot
61b61e49ed Merge "Fix the ambient lux which did not update for blocking zone" into rvc-qpr-dev 2021-01-12 21:45:48 +00:00
Winson Chung
119e2ff2de Merge "3/ Update OneHanded to use shell main thread" 2021-01-12 21:13:43 +00:00
Ryan Mitchell
0ad9a225d4 Revert "OMS: add tests for the OMS transactional API" 
This reverts commit 2241956858.

Reason for revert: 177065099

Change-Id: Id47cc94591eefbc276f77ae8601bb6d52cfa2f63
 2021-01-12 21:11:17 +00:00
Ryan Mitchell
118ddbccc9 Revert "Push OverlayDeviceTests onto /system" 
This reverts commit 2b1b3b282f.

Reason for revert: b/177065099

Change-Id: I0ac8d525c9f36ace5e65ffb2305f75fef0b6dc65
 2021-01-12 21:10:19 +00:00