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

460451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
4e37fa7cb3 Merge changes from topic "sp06-offloadcontroller" am: 01d30a4ce0 am: b61116705a am: c6a841b77b 
Change-Id: I4e7924ebb2d37ecffb8facce0ec51643afb12264
 2020-01-15 05:33:32 +00:00
Kyunglyul Hyun
77b46edc46 Merge "MediaSession: Add volumeControlId in MediaCotnroller.PlaybackInfo" 2020-01-15 05:27:27 +00:00
Automerger Merge Worker
c6a841b77b Merge changes from topic "sp06-offloadcontroller" am: 01d30a4ce0 am: b61116705a 
Change-Id: I6cfdf69a9752a481e5c03780ac596f5b4cbd4eb2
 2020-01-15 05:17:18 +00:00
Junyu Lai
b61116705a Merge changes from topic "sp06-offloadcontroller" 
am: 01d30a4ce0

Change-Id: I4549cb9b54ade6a9b45217be133aff535ec60b62
 2020-01-14 21:03:35 -08:00
TreeHugger Robot
e33a992c19 Merge "Move focus dispatch to input (2/2)" 2020-01-15 04:52:14 +00:00
Junyu Lai
01d30a4ce0 Merge changes from topic "sp06-offloadcontroller" 
* changes:
  [SP09] Remove NetworkStatsService @hide usage in Tethering
  [SP08] re-calculate interface quota when limit reached
  [SP07] Remove reference of NetworkStatsService in IpServer
  [SP06.1] Add UPDATE_DEVICE_STATS permission to Tethering
  [SP06] Use system API to communicate with NSS in OffloadController
  Use Context#getSystemService to get network stack binder
 2020-01-15 04:50:27 +00:00
Automerger Merge Worker
cc4a17a501 Merge "Replace usages of ServiceState#getDataNetworkType" am: 922ec35d28 am: 6875770a4e am: 3173e5db01 
Change-Id: Ifefddf01b24283bdeca54a8cc9442f69b1949cb7
 2020-01-15 04:46:46 +00:00
Mark Chien
9eb533470d Merge "Unhide NetworkRequest API which use legacy type" 2020-01-15 04:29:15 +00:00
Automerger Merge Worker
3173e5db01 Merge "Replace usages of ServiceState#getDataNetworkType" am: 922ec35d28 am: 6875770a4e 
Change-Id: Ibf29269e9e0514fe3604f6fa0a2056b0a44c211b
 2020-01-15 04:28:09 +00:00
Remi NGUYEN VAN
b7c80b5557 Merge "Add NetworkRequest#satisfiedBy to SystemApi" 2020-01-15 04:14:32 +00:00
Remi NGUYEN VAN
b9fd752f64 Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST" 2020-01-15 04:13:59 +00:00
TreeHugger Robot
a4d5c18918 Merge "Fix enforceModifyAudioRoutingPermission for system_server" 2020-01-15 04:11:57 +00:00
Hall Liu
6875770a4e Merge "Replace usages of ServiceState#getDataNetworkType" 
am: 922ec35d28

Change-Id: Icbdeb12e752bfd77e8c818251b442acb93079f66
 2020-01-14 20:10:00 -08:00
Treehugger Robot
922ec35d28 Merge "Replace usages of ServiceState#getDataNetworkType" 2020-01-15 04:05:36 +00:00
TreeHugger Robot
99f6353669 Merge "Whitelist Paintbooth" 2020-01-15 03:57:02 +00:00
Nikita Ioffe
48fbb0807b Merge "Add new atom to log userspace reboot performance" 2020-01-15 03:50:57 +00:00
TreeHugger Robot
e2b62e4f12 Merge changes I8cfea8ab,I349611e3 
* changes:
  Recover from HAL death in sound trigger
  Lint cleanup
 2020-01-15 03:49:48 +00:00
Automerger Merge Worker
13108fac26 [automerger skipped] Merge "Created an API to get encoded message of SubmitPuds" am: d48914249d am: 5ea4055499 am: 09f2c4778c -s ours 
am skip reason: Change-Id I1a26bd306812a5f8489978cc6ac30770dcf3f0f1 with SHA-1 adc04fee22 is in history

Change-Id: I168bc512e5a1e858d428a1892bf7b1db210418b1
 2020-01-15 03:37:22 +00:00
Automerger Merge Worker
d3cb54c8d9 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23 am: f01f6aec2f 
Change-Id: I93ebc67677fc326871ba151a4b6bae0bc60e197d
 2020-01-15 03:36:50 +00:00
Automerger Merge Worker
a1406a818e Merge "Audioservice:do not supress music volume adjustment" am: 24f8ed2d98 am: 4c8aed88bc am: 0090148031 
Change-Id: I44cf25bb501aa5ce777b0984bba03e197dd5df8c
 2020-01-15 03:36:23 +00:00
Wu Ahan
d5b8f0590d Merge "Make some apis @TestApi and @hide for usage in tests" 2020-01-15 03:33:41 +00:00
Automerger Merge Worker
09f2c4778c Merge "Created an API to get encoded message of SubmitPuds" am: d48914249d am: 5ea4055499 
Change-Id: I8acc8ab681a66eb86b0cefd72e2500838eff379e
 2020-01-15 03:25:27 +00:00
Automerger Merge Worker
f01f6aec2f Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23 
Change-Id: If317967b103c8b797a74b089c13b518c33b60465
 2020-01-15 03:24:56 +00:00
Automerger Merge Worker
0090148031 Merge "Audioservice:do not supress music volume adjustment" am: 24f8ed2d98 am: 4c8aed88bc 
Change-Id: I10e4e4aec1a868bb663933e4ab2c34f231efd525
 2020-01-15 03:23:51 +00:00
Zongheng Wang
5ea4055499 Merge "Created an API to get encoded message of SubmitPuds" 
am: d48914249d

Change-Id: I161ab889cd98676f1669f8fff4ddd9df1ed68605
 2020-01-14 19:15:40 -08:00
Alexander Dorokhine
2c72e9d8c4 Merge "Add implementation tests for AppSearchSchema framework classes." 2020-01-15 03:13:20 +00:00
Allen Su
b7336f1d23 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" 
am: b498fbf860

Change-Id: I75ecb2ac860bd409a5610bdd07704139ed8ac04f
 2020-01-14 19:09:12 -08:00
TreeHugger Robot
afb4dd9695 Merge "Remove repeated function" 2020-01-15 03:06:35 +00:00
Zongheng Wang
d48914249d Merge "Created an API to get encoded message of SubmitPuds" 2020-01-15 03:05:14 +00:00
Jean-Michel Trivi
4c8aed88bc Merge "Audioservice:do not supress music volume adjustment" 
am: 24f8ed2d98

Change-Id: Ic0316d1a821a0e3c03e5784736e5a6e4266110d3
 2020-01-14 19:04:00 -08:00
Automerger Merge Worker
0b5ea98c1a Merge "Add hkuang to Media OWNERS." am: 4a87745a4d am: 06731657a2 am: 21dd04ca70 
Change-Id: I24108e2ae91d81638f40c3dc9aeaa9c305580eab
 2020-01-15 02:49:21 +00:00
TreeHugger Robot
a682ec6e7d Merge "Remove framework code that has moved to frameworks/libs/net" 2020-01-15 02:47:52 +00:00
TreeHugger Robot
60a50d4cbf Merge "Add net-utils-framework-common-srcs to framework" 2020-01-15 02:47:52 +00:00
Paul Hu
cb8f129c89 Merge "Expose SocketKeepalive#SUCCESS as SystemApi" 2020-01-15 02:44:32 +00:00
Allen Su
b498fbf860 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" 2020-01-15 02:42:27 +00:00
Jean-Michel Trivi
24f8ed2d98 Merge "Audioservice:do not supress music volume adjustment" 2020-01-15 02:42:04 +00:00
Automerger Merge Worker
21dd04ca70 Merge "Add hkuang to Media OWNERS." am: 4a87745a4d am: 06731657a2 
Change-Id: I1530fc48251d6afbb6c18eb78028d1a183512e1c
 2020-01-15 02:38:04 +00:00
Hangyu Kuang
06731657a2 Merge "Add hkuang to Media OWNERS." 
am: 4a87745a4d

Change-Id: I04d949ee33c3e5d27473d86e26be716e936284c8
 2020-01-14 18:24:40 -08:00
Hangyu Kuang
4a87745a4d Merge "Add hkuang to Media OWNERS." 2020-01-15 02:18:14 +00:00
Jeffrey Huang
2f2696676a Merge changes Ica1f17dc,I7d959c93,I3403affa,I791c5d23,I5448b77d 
* changes:
  Migrate pullCpuClusterTime
  Migrate pullCpuActiveTime
  Migrate pullCpuTimePerUidFreq
  Migrate pullCpuTimePerUid
  Migrate pullCpuTimePerFreq
 2020-01-15 02:10:50 +00:00
TreeHugger Robot
6fd5b06f4c Merge "Update JavaDoc for CACHE_FILTER_NONE" 2020-01-15 02:05:23 +00:00
Shawn Lin
c4b718ff79 Merge "Add dimens for waterfall display edges" 2020-01-15 01:21:21 +00:00
Tsung-Mao Fang
e6affb4a79 Merge "Ignore failed test" 2020-01-15 01:18:23 +00:00
Tsung-Mao Fang
2fdb2fad9f Ignore failed test 
Bug: 147703223
Test: run robotest
Change-Id: I1c0e225355c0757a98ab11f76515941cee294bd3
 2020-01-15 09:05:32 +08:00
Bonian Chen
4c1b1ff615 Merge "[Settings] Expose @hide APIs as @SystemApi" 2020-01-15 01:04:01 +00:00
TreeHugger Robot
71e50f5199 Merge "Check mIncludeCode before building appComponentFactory" 2020-01-15 00:56:49 +00:00
Curtis Belmonte
e0e5852108 Merge "Add auth type to BiometricPrompt.AuthenticationResult" 2020-01-15 00:44:26 +00:00
Tsung-Mao Fang
e84964faad Merge "Ignoring more Telephony related tests" 2020-01-15 00:37:52 +00:00
Jean-Michel Trivi
c1062acc5f Fix enforceModifyAudioRoutingPermission for system_server 
When checking MODIFY_AUDIO_ROUTING permission in AudioService,
grant it for calls coming from system_server.

Bug: 147655685
Test: see bug
Change-Id: I84cd70f742549da95816321335c613588f274807
 2020-01-14 16:32:32 -08:00
hkuang
14c876311a Add hkuang to Media OWNERS. 
Bug:145233472
Test: None
Change-Id: I233800683bd9f4e0d47d62eab9fef7a3d09b583b
 2020-01-14 16:29:06 -08:00