Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
438,309 Commits 3 Branches 0 Tags
d4d2c2bec55ca70a02c19574e9d7b6a1156b38f0
Commit Graph

438309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bookatz
d4d2c2bec5 Merge "Fix capitalized variable UserData" 
am: c6f86d3403

Change-Id: I533903954beda7e999b24a216f4f21e717469a71
 2019-12-06 07:35:40 -08:00
Treehugger Robot
c6f86d3403 Merge "Fix capitalized variable UserData" 2019-12-06 15:26:11 +00:00
Anton Hansson
49aa386a67 Merge "Add an init service for setting sdk props" 
am: 6a8eaf415d

Change-Id: Icd111732d68c14a2ecf301d1b9d1ef308e10baac
 2019-12-06 05:34:35 -08:00
Anton Hansson
6a8eaf415d Merge "Add an init service for setting sdk props" 2019-12-06 13:28:21 +00:00
Anton Hansson
21699364c4 Merge "Add genrule for the current sdk proto" 
am: 2df0a1096a

Change-Id: I57b69f94665c8d3ec0f64c896c4941a451b80169
 2019-12-06 04:12:38 -08:00
Anton Hansson
2df0a1096a Merge "Add genrule for the current sdk proto" 2019-12-06 12:04:55 +00:00
Neil Fuller
c72f796176 Merge "TimeDetector improvements" 
am: 6e3020490d

Change-Id: Iada62157e9106ae985471e9dffcd249655c7f185
 2019-12-06 04:02:09 -08:00
Neil Fuller
6e3020490d Merge "TimeDetector improvements" 2019-12-06 11:53:14 +00:00
Anton Hansson
f176e6da35 Merge "Add derive_sdk binary for reading sdk protos" 
am: 2613c2d9d4

Change-Id: Idc52a59e5fe2e15e816742d702ebe6844ad004ff
 2019-12-06 03:23:11 -08:00
Anton Hansson
2613c2d9d4 Merge "Add derive_sdk binary for reading sdk protos" 2019-12-06 11:13:03 +00:00
Aaron Huang
1abb8de060 Merge "Add TrafficStats methods to public APIs" 
am: 8aed6e69f0

Change-Id: Ifc4bd75a3d1fbafbe666842223c914ca9b42a6df
 2019-12-06 03:08:19 -08:00
Aaron Huang
8aed6e69f0 Merge "Add TrafficStats methods to public APIs" 2019-12-06 10:59:11 +00:00
Aaron Huang
29667d2942 Add TrafficStats methods to public APIs 
Add methods to public APIs for mainline support.

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      atest android.net.cts
      atest android.net.wifi.cts

Change-Id: I21a9c0dbdc79b1f1041fc9e23c6a4e1e97ecde92
 2019-12-06 16:19:40 +08:00
lucaslin
1e2e0892ba Merge "Remove incorrect annotation - @TransportType" 
am: 7f81046bed

Change-Id: I99b74e5e67f5ff6f8d35f627e2c40ef4ca001c0c
 2019-12-05 20:57:08 -08:00
Treehugger Robot
7f81046bed Merge "Remove incorrect annotation - @TransportType" 2019-12-06 04:50:27 +00:00
lucaslin
597b5b2aa6 Remove incorrect annotation - @TransportType 
This annotation is mis-adding by aosp/929879, and now it also
makes compilation failure for Telephony Mainline.

Bug: 145755373
Test: atest FrameworksNetTests
Change-Id: Ic22ce6bf17c4300b8cd52217976bfb215a123f68
 2019-12-06 11:17:25 +08:00
Hall Liu
798e77ff77 Merge "Remove telephony hidden api usages from commands" 
am: e07c943cfd

Change-Id: I439df24d973dce041a4ed8d1659737973548c130
 2019-12-05 19:14:19 -08:00
Treehugger Robot
e07c943cfd Merge "Remove telephony hidden api usages from commands" 2019-12-06 03:03:23 +00:00
Hall Liu
e3b535b98c Remove telephony hidden api usages from commands 
Remove usages of Telephony hidden APIs from Telecom's debugging commands

Fixes: 141576016
Test: manual
Change-Id: Ia1184f804b3b03104dd5c911b15c8c28190b2395
Merged-In: Ia1184f804b3b03104dd5c911b15c8c28190b2395
 2019-12-05 18:21:06 -08:00
Rahul Sabnis
f9f689020c Merge "Make BluetoothUuid constants and some functions System Apis" 
am: f6ea5afa58

Change-Id: I52b33b066f2566c2d069a1e5d79698cca67eb22e
 2019-12-05 17:34:27 -08:00
Harpreet \"Eli\" Sangha
fb0e76110d Merge "VibratorService: Fix Typo in AIDL Perform Effect" 
am: 1a0e1bae27

Change-Id: I5096c9f87b10ebd63dcdd98cf79f05815fb34613
 2019-12-05 17:32:08 -08:00
Treehugger Robot
f6ea5afa58 Merge "Make BluetoothUuid constants and some functions System Apis" 2019-12-06 01:23:39 +00:00
Treehugger Robot
1a0e1bae27 Merge "VibratorService: Fix Typo in AIDL Perform Effect" 2019-12-06 01:22:04 +00:00
Meng Wang
484b1b87e0 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" 
am: 392f3db6b0

Change-Id: I374eb6af26f16c089054b98140648e0004e7dc59
 2019-12-05 17:14:47 -08:00
Meng Wang
392f3db6b0 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" 2019-12-06 00:32:40 +00:00
Rahul Sabnis
12558824e4 Merge "Refactor BluetoothHeadset APIs used by Settings" 
am: b3de542cf7

Change-Id: I239a1aa1ca4e8e374e99d7f4d4d25fb3bb6d1691
 2019-12-05 16:19:12 -08:00
Treehugger Robot
b3de542cf7 Merge "Refactor BluetoothHeadset APIs used by Settings" 2019-12-06 00:11:52 +00:00
Tyler Gunn
86445ea5c3 Merge "Add Verstat fields to Telecom call/connection classes." 
am: 4efe689e4c

Change-Id: I0f56b37524325a44ba13e228183b0db0bffbf04c
 2019-12-05 16:10:41 -08:00
Tyler Gunn
4efe689e4c Merge "Add Verstat fields to Telecom call/connection classes." 2019-12-05 23:58:45 +00:00
Meng Wang
d973a4b22c Merge "Move DataConnectionRealTimeInfo from telephony to core." 
am: 037b717fe8

Change-Id: I0cd87ce8a485c02f4462cfdd7532eaf402fd6956
 2019-12-05 15:51:22 -08:00
Meng Wang
037b717fe8 Merge "Move DataConnectionRealTimeInfo from telephony to core." 2019-12-05 23:43:06 +00:00
Eric Laurent
917934e7e5 Merge "AudioService: communicate audio HAL process pids to native audioserver" 
am: e16beef1cd

Change-Id: Ie30055446f2fb2ea40c497da65f2dfecbd201b90
 2019-12-05 15:35:52 -08:00
Meng Wang
cb0d068f28 Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" 
am: ddf215dd58

Change-Id: I68194558a0266cabedf81cdf43b73dba69d02779
 2019-12-05 15:33:29 -08:00
Treehugger Robot
e16beef1cd Merge "AudioService: communicate audio HAL process pids to native audioserver" 2019-12-05 23:27:30 +00:00
Meng Wang
ddf215dd58 Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" 2019-12-05 23:23:51 +00:00
Jack Yu
0bcd4fc5b3 Merge "Add no-service configuration for GB and JP" 
am: 954dcc18d7

Change-Id: Icedf5d8f6ea12c130604815ac8540c9181afa83c
 2019-12-05 15:09:18 -08:00
Songchun Fan
c93841a265 Merge "[incremental] parcelable for incfs file descriptors" 
am: c8b066091e

Change-Id: Id9b7438ea32a1cc08e62791be4a1b9c566c30876
 2019-12-05 15:05:42 -08:00
Jack Yu
954dcc18d7 Merge "Add no-service configuration for GB and JP" 2019-12-05 22:24:33 +00:00
Songchun Fan
c8b066091e Merge "[incremental] parcelable for incfs file descriptors" 2019-12-05 22:02:49 +00:00
Sarah Chin
1cf53ac4c3 Merge changes from topics "ngran", "update_ngran" 
am: 226499214c

Change-Id: I164421a52add13fb78423ae92493ce9c10a58f03
 2019-12-05 13:48:41 -08:00
Sarah Chin
b77ce1b7ba Updated AccessNetworkConstants and RadioAccessSpecifier 
am: e138c5e412

Change-Id: Ib0a674b8b0caba16eec524e8333047567e3e5aac
 2019-12-05 13:48:27 -08:00
Sarah Chin
226499214c Merge changes from topics "ngran", "update_ngran" 
* changes:
  Update NGRAN bands
  Updated AccessNetworkConstants and RadioAccessSpecifier
 2019-12-05 21:37:37 +00:00
Meng Wang
62d2ff8b36 Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager 
Because the constants are only used by TelephonyRegistryManager and
TelephonyRegistry.

Bug: 140908357
Test: make
Change-Id: I6933d1aa5b8dc35f136c8c4aed8572221ddfb755
 2019-12-05 21:32:03 +00:00
Eric Laurent
a270b7c0e5 AudioService: communicate audio HAL process pids to native audioserver 
Retrieve audio HAL processes pids from service manager and send them
to AudioFlinger native service. This is needed to dump audio HAL process tombstones
and because audioserver process does not have the SELinux permission to
list services.

Bug: 141528385
Test: Force watchdog and verify tombstone creation
Change-Id: I3e35b8040779e041b8d8c2e72d1e650d6f8fe818
Merged-In: I3e35b8040779e041b8d8c2e72d1e650d6f8fe818
 2019-12-05 12:51:41 -08:00
Meng Wang
646dcbd0ed Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY 
Replaced with SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX. Both are set
in Intent extras by SubscriptionManager#putPhoneIdAndSubIdExtra.

Bug: 140908357
Test: make
Change-Id: I54a65ef81acc68c34af6263e929634f15f05e494
 2019-12-05 12:12:20 -08:00
Srinivas Paladugu
3794858ba2 Merge "Add owners for ZramWriteback" 
am: d481f63525

Change-Id: I91818e0cc5e13731cbe78bec39ddec4504ae8821
 2019-12-05 12:03:08 -08:00
Treehugger Robot
d481f63525 Merge "Add owners for ZramWriteback" 2019-12-05 19:49:51 +00:00
Yan Yan
276c583af6 Merge "Fix and suppress API lint warning" 
am: bba4e2721b

Change-Id: Ibb1bf33927f8ed452250e3a91ed77c60ca18da09
 2019-12-05 11:40:29 -08:00
Yan Yan
bba4e2721b Merge "Fix and suppress API lint warning" 2019-12-05 19:24:36 +00:00
Srinivas Paladugu
16854888c0 Add owners for ZramWriteback 
Change-Id: Ie70efc8a5afc842c2ef2a1b8235c1a908bb8e470
 2019-12-05 10:42:08 -08:00