OSDN Git Service
Seigo Nonaka [Thu, 25 Oct 2018 18:23:32 +0000 (18:23 +0000)]
Revert "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE"
This reverts commit
155951f2f6080d87e6cca6698e63ecb58641442d.
Reason for revert: broke test in pi-dev/stage-aosp-master
Change-Id: I917e170b570b89ba2e8a26cec0bf0a8adf577b80
Seigo Nonaka [Wed, 24 Oct 2018 00:39:53 +0000 (17:39 -0700)]
Update test cases for HarfBuzz 2.0.2 DO NOT MERGE
Now HarfBuzz combines chars with ZWJ into single cluster
Bug:
117953171
Test: TreeHugger
Change-Id: Ic642c469aab90a2ecd3874cf0dec82625ea21c1b
Merged-In: I531b7a5f5727540d6d11db619eeba6eb23fb113d
Chen Xu [Mon, 22 Oct 2018 16:53:18 +0000 (16:53 +0000)]
Merge "Need to check empty not null for String"
Chen Xu [Mon, 22 Oct 2018 16:36:25 +0000 (16:36 +0000)]
Merge changes from topic "carrier_id_aosp_cp"
* changes:
support mno carrier id
support privilege access rule for carrier identification
Paul Duffin [Mon, 22 Oct 2018 14:47:33 +0000 (14:47 +0000)]
Merge "Remove more libcore classes from light grey/vendor lists"
Paul Duffin [Wed, 17 Oct 2018 10:37:57 +0000 (11:37 +0100)]
Remove more libcore classes from light grey/vendor lists
Removes more libcore classes from the light grey/vendor lists as they
are now using UnsupportedAppUsage annotation.
Test: ensured that generated light grey list did not change
Bug:
117818301
Merged-In: I2e12bad6dcf648ae9dfed2cd5a3d2c7f2a01a506
Change-Id: I1361408eacae9b7320babec8ddc2afb10d08feaf
Treehugger Robot [Mon, 22 Oct 2018 08:04:41 +0000 (08:04 +0000)]
Merge "Reduce excess local prefix computations"
Treehugger Robot [Mon, 22 Oct 2018 07:08:10 +0000 (07:08 +0000)]
Merge "pm: Disallow HIDL libs from boot jars >= Q."
markchien [Mon, 1 Oct 2018 13:18:15 +0000 (21:18 +0800)]
Reduce excess local prefix computations
only recomputing on the LISTEN_ALL callback
Test: - build, flash, booted
- runtest frameworks-net
bug:
110335330
Change-Id: I606574f1a8a2899ed4688d7d5ec2cbe0f2638a94
Neil Fuller [Sun, 21 Oct 2018 18:10:48 +0000 (18:10 +0000)]
Merge "Remove explicit dependencies on core library"
chen xu [Tue, 16 Oct 2018 18:55:26 +0000 (11:55 -0700)]
support mno carrier id
Bug:
110559381
Test: CarrierResolverTest.testMnoCarrierId
Change-Id: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
Merged-in: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
fionaxu [Fri, 8 Jun 2018 23:55:25 +0000 (16:55 -0700)]
support privilege access rule for carrier identification
Bug:
69807697
Bug:
72665237
Test: Manual
Change-Id: I5e00302684b2be93ee956d43b04ca9a12d043158
Merged-in: I5e00302684b2be93ee956d43b04ca9a12d043158
Neil Fuller [Thu, 18 Oct 2018 14:03:50 +0000 (15:03 +0100)]
Remove explicit dependencies on core library
These dependencies appear not to be necessary.
Test: make api-stubs-docs-update-current-api and inspect api/current.txt
Test: make docs and compare offline_sdk output
Bug:
113148576
Change-Id: If363aa99c8e230c0d63db6677241eb152a5b8fec
Treehugger Robot [Sat, 20 Oct 2018 07:25:24 +0000 (07:25 +0000)]
Merge "Fix FD leak during ADB shell install."
Treehugger Robot [Sat, 20 Oct 2018 01:08:55 +0000 (01:08 +0000)]
Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."
Chih-hung Hsieh [Sat, 20 Oct 2018 00:44:34 +0000 (00:44 +0000)]
Merge "Allow implicit-fallthrough warnings locally."
Treehugger Robot [Sat, 20 Oct 2018 00:15:20 +0000 (00:15 +0000)]
Merge "Fix implicit-fallthrough warnings."
Chih-Hung Hsieh [Fri, 19 Oct 2018 22:32:26 +0000 (15:32 -0700)]
Fix implicit-fallthrough warnings. DO NOT MERGE.
These changes are not needed in goog/master.
Test: make checkbuild
Bug:
112564944
Change-Id: I75972e680c9502e1b83845f08e79b99a8084cc4c
Dan Shi [Fri, 19 Oct 2018 22:13:34 +0000 (22:13 +0000)]
Merge "Mark 4 tests as FlakyTest"
Dan Shi [Fri, 19 Oct 2018 21:25:36 +0000 (14:25 -0700)]
Mark 4 tests as FlakyTest
Until b/
113616538 is fixed, a test class without FlakyTest, can be included in
a presubmit test mapping suite unexpectedly. Mark these 3 classes as FlakyTest
for now:
ActivityManagerServiceTest
AssistDataRequesterTest
AppErrorDialogTest
This test becomes unstable and still needs to be fixed before it can run in
presubmit:
TaskPositioningControllerTests
Bug:
117880789
Test: none
Change-Id: I3ed29bcbd30e34d6fd97169ac2913fbf312d4f70
Bill Yi [Fri, 19 Oct 2018 21:19:30 +0000 (21:19 +0000)]
Merge "Merge pi-dr1-dev to aosp-master"
Chih-Hung Hsieh [Fri, 19 Oct 2018 21:19:29 +0000 (14:19 -0700)]
Fix implicit-fallthrough warnings.
Test: make checkbuild
Bug:
112564944
Change-Id: Iaebada5e1a5d94ed06d9b584b888a4f78c0b8505
Brad Ebinger [Fri, 19 Oct 2018 20:20:14 +0000 (20:20 +0000)]
Merge "Expose the empty MmTelCapabilities constructor"
Treehugger Robot [Fri, 19 Oct 2018 19:26:20 +0000 (19:26 +0000)]
Merge "Remove resources for 4G/LTE/LTE+ icons"
Bill Yi [Fri, 19 Oct 2018 19:20:31 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master
Change-Id: I40fca8b785049f8563809a70f6671b8af89f3cfd
Treehugger Robot [Fri, 19 Oct 2018 19:19:26 +0000 (19:19 +0000)]
Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED"
Chih-Hung Hsieh [Fri, 19 Oct 2018 19:13:48 +0000 (12:13 -0700)]
Allow implicit-fallthrough warnings locally.
It will be a global error by default.
Test: make checkbuild
Bug:
112564944
Change-Id: Ib23d0cc8b95a3734d5bd28f8c9d967df669cfdf8
Exempt-From-Owner-Approval: do not block on new warnings
Chen Xu [Fri, 19 Oct 2018 18:47:27 +0000 (18:47 +0000)]
Merge "new SystemAPI for setCarrierDataEnabled"
Chen Xu [Fri, 19 Oct 2018 18:36:56 +0000 (18:36 +0000)]
Merge "Revert "Telephony light grey list clean up for Q""
Niklas Lindgren [Mon, 24 Sep 2018 08:18:44 +0000 (10:18 +0200)]
Remove resources for 4G/LTE/LTE+ icons
CarrierConfig values have been added to better support MVNOs.
Remove the legacy resources.
Test: Make sure that marlin builds with the new carrier configs.
Bug:
113309357
Bug:
113309356
Change-Id: I3b0af46282a4b7fc8487acfb75b5dbbb7f41d316
Merged-In: I3b0af46282a4b7fc8487acfb75b5dbbb7f41d316
chen xu [Thu, 18 Oct 2018 21:24:58 +0000 (14:24 -0700)]
correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED
keep the value same as master
Bug:
117930373
Test: telephony unit test
Change-Id: I0bad21eeed2b4667fbb781253828b99332103b31
Merged-in: Id170063bfdb1e3325f67e8680231ab4deda7d65d
Chen Xu [Fri, 19 Oct 2018 18:13:04 +0000 (11:13 -0700)]
Merge "expose some Telephony.Carriers cols system APIs"
am:
f2e0f57976
Change-Id: Ifbceb368352aa1f57912b6690f61fe8412e2dc41
Chen Xu [Fri, 19 Oct 2018 17:59:18 +0000 (17:59 +0000)]
Revert "Telephony light grey list clean up for Q"
This reverts commit
253bdb7175036472d3f75422f5bc9ac51949431e.
Reason for revert: This CL caused MMS break because Bugle is using the
hidden API in Q's darkgrey list. The proper fix should either come from
Bugle team if their apk moved to Q, or compat team to explore why this
caused issue for app target on P.
Change-Id: Icc6c190cde79c10d9045183c0b80cdf008e95578
Bug:
117899984
Stanley Tng [Fri, 19 Oct 2018 17:59:53 +0000 (10:59 -0700)]
Merge "Fix missing connection state changes intent for Hearing Aids"
am:
4c7123f8e3
Change-Id: I8fd60c7a9e1458c9d391407cd53c9cd56fb5509d
Chen Xu [Fri, 19 Oct 2018 17:56:14 +0000 (17:56 +0000)]
Merge "expose some Telephony.Carriers cols system APIs"
Youming Ye [Fri, 19 Oct 2018 17:15:55 +0000 (10:15 -0700)]
Merge changes from topic "cherrypick"
am:
c4b647458c
Change-Id: Id372458d932eb34db2f7cdc5bc25159f65f1d93c
Treehugger Robot [Fri, 19 Oct 2018 17:09:34 +0000 (17:09 +0000)]
Merge "Fix missing connection state changes intent for Hearing Aids"
SongFerngWang [Fri, 19 Oct 2018 17:08:46 +0000 (10:08 -0700)]
add four new carrier configs for supplementary service precautions.
am:
7e7c7d2abf
Change-Id: If9d738a3c9632410dc913ed08109b975e90b36a2
Youming Ye [Fri, 19 Oct 2018 16:33:22 +0000 (16:33 +0000)]
Merge changes from topic "cherrypick"
* changes:
Add CarrierConfig to hide "Network default" option in Caller ID setting
add four new carrier configs for supplementary service precautions.
Junyu Lai [Fri, 19 Oct 2018 16:18:38 +0000 (09:18 -0700)]
Merge "Add tests for the network blocked status change"
am:
af0de1a2e9
Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e
Junyu Lai [Fri, 19 Oct 2018 16:14:23 +0000 (09:14 -0700)]
Merge "Add new callback to inform blocking of network on specific uid."
am:
f709e754ab
Change-Id: Ia99ee2fbefa67a7ee00d6fecce430ba6431945cd
Junyu Lai [Fri, 19 Oct 2018 15:20:48 +0000 (15:20 +0000)]
Merge "Add tests for the network blocked status change"
Junyu Lai [Fri, 19 Oct 2018 15:20:48 +0000 (15:20 +0000)]
Merge "Add new callback to inform blocking of network on specific uid."
Chalard Jean [Fri, 19 Oct 2018 12:10:55 +0000 (05:10 -0700)]
Merge "Fix a bug where Uri can't parse IPv6 literal addresses."
am:
54677a86d4
Change-Id: Ibf681262344904990f77f9016f3ffc9efbce08ba
Mike Yu [Fri, 17 Aug 2018 07:22:05 +0000 (15:22 +0800)]
Add tests for the network blocked status change
onBlockedStatusChanged is intruduced for network blocked status.
The changes in this patch are:
- Test onBlockedStatusChanged which tells apps whether the
network is blocked.
- Fixed the tests which is affected by the order changed in
onAvailable.
Test: as follows
- runtest frameworks-net
- runtest -x NetworkPolicyManagerServiceTest.java
Bug:
74575553
Change-Id: I383c037ed895ef69c478dc3cff69fb1e27c42845
Treehugger Robot [Fri, 19 Oct 2018 11:04:29 +0000 (11:04 +0000)]
Merge "Fix a bug where Uri can't parse IPv6 literal addresses."
Chuanghua Zhao [Wed, 17 Oct 2018 12:00:04 +0000 (20:00 +0800)]
Fix FD leak during ADB shell install.
Temp fileBridge never closed before remove from bridge list,
it will cause socket FD leak during ADB install.
Improvements:
Call FileBridge#forceClose() to close FD.
Test:
1.PMS install and un-install work normal.
2.Socket FD in system_server process not increase during ADB install.
BUG:
117965848
Change-Id: I29951095f66f069263f944787875e22b666e7467
Stanley Tng [Tue, 25 Sep 2018 22:43:41 +0000 (15:43 -0700)]
Fix missing connection state changes intent for Hearing Aids
In some corner cases, the intent receiver for hearing aids CONNECTION_STATE_CHANGED
is not registered. This fixes this problem.
Test: Manual tests with one Hearing Aid device and in Settings-Device
details page.
Bug:
116643085
Change-Id: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Mathieu Chartier [Fri, 19 Oct 2018 06:52:16 +0000 (23:52 -0700)]
Merge "Sleep 1s before force stop and use killBackgroundApp"
am:
2417859fa5
Change-Id: I92d83f16123dd16f68eb0d95d83f9dbabd493d01
sqian [Fri, 19 Oct 2018 06:41:46 +0000 (23:41 -0700)]
Merge "Fix current.txt"
am:
2810d0ae3e
Change-Id: I67eca70fe8d4ef7700e547de54be6d03aca492c7
Ajay Panicker [Fri, 19 Oct 2018 06:24:17 +0000 (23:24 -0700)]
Merge "Synchronize on a static final object to lock mDeviceBusy"
am:
34f9a3e9e9
Change-Id: I8547f2f6f7caed16887558416525fb7d40cda46a
Seongho Kim [Wed, 17 Oct 2018 03:18:17 +0000 (12:18 +0900)]
Need to check empty not null for String
getWcdmaLevel needs to check empty string, which is currently doesn't
because mWcdmaDefaultSignalMeasurement could be not null but empty string.
Test: TelephonybaseTest
Change-Id: If00a5953eef972250266ceef234cce213d45bc6a
Signed-off-by: Seongho Kim <sh_tiger.kim@samsung.com>
Chalard Jean [Thu, 18 Oct 2018 08:19:56 +0000 (17:19 +0900)]
Fix a bug where Uri can't parse IPv6 literal addresses.
Bug:
25540738
Test: added CTS in aosp change #793137 and ran them
Change-Id: Ibf870b7e87799090fae9ed456286c11990b01461
taiki tsutsumi [Wed, 30 May 2018 04:50:16 +0000 (13:50 +0900)]
Add CarrierConfig to hide "Network default" option in Caller ID setting
Add a key to hide "Network default". When value is false,
"Network default" shouldn't be displayed for options in Caller ID
setting.
Test: manual - check options in Caller ID setting
Bug:
111809829
Change-Id: Id07ab2d2281a1ebb07d631045ada705cda53daf2
Merged-In: I5fbe9734dbb092b25fd145344c7559d2dee79df2
Mathieu Chartier [Fri, 19 Oct 2018 01:07:36 +0000 (01:07 +0000)]
Merge "Sleep 1s before force stop and use killBackgroundApp"
SongFerngWang [Mon, 9 Jul 2018 13:10:26 +0000 (21:10 +0800)]
add four new carrier configs for supplementary service precautions.
The carrier configs control the supplementary service precautions for
call forwarding ,call barring ,caller id ,and call waiting .
Bug:
80404623
Test: Build pass
Change-Id: I5fbe9734dbb092b25fd145344c7559d2dee79df2
Treehugger Robot [Thu, 18 Oct 2018 23:28:17 +0000 (23:28 +0000)]
Merge "Fix current.txt"
chen xu [Thu, 18 Oct 2018 05:57:45 +0000 (22:57 -0700)]
new SystemAPI for setCarrierDataEnabled
Bug:
116138716
Test: Telephony unit test
Change-Id: I6fba04dab8fd067f49b17afa2a640b7d00092a3f
Merged-in: I6fba04dab8fd067f49b17afa2a640b7d00092a3f
Mathieu Chartier [Thu, 18 Oct 2018 16:26:41 +0000 (09:26 -0700)]
Sleep 1s before force stop and use killBackgroundApp
Leave a bit of time before force stopping the application. This might
help prevent bad numbers.
Call killbackgroundApp after doing force-stop to make sure nothing is
still running.
Bug:
117094510
Bug:
117888316
Test: atest google/perf/app-startup/third-party-apps/cold-dropcache-stable-test
Change-Id: I47792f99b38edf2c40f61cc3f6817d82e6339d12
Treehugger Robot [Thu, 18 Oct 2018 22:00:49 +0000 (22:00 +0000)]
Merge "Synchronize on a static final object to lock mDeviceBusy"
Hall Liu [Thu, 18 Oct 2018 21:56:21 +0000 (14:56 -0700)]
Merge "Add dynamic support for 4G/LTE/LTE+ icons"
am:
0c9254ee66
Change-Id: Ie5841b4e86231517f724948389ff2b819d8245ad
Brad Ebinger [Thu, 18 Oct 2018 21:52:24 +0000 (14:52 -0700)]
Merge "Expose ImsExternalCallState constructor as @SystemApi"
am:
4133a00a10
Change-Id: Ic1245b146735f33ec679a83eb7dd228b4aeb3178
Kyeongkab.Nam [Thu, 18 Oct 2018 21:41:48 +0000 (14:41 -0700)]
Merge "CEC: Make TV try to dispatch the message first"
am:
aa3970209e
Change-Id: Ia5ecee02a2424d895f344a7c22f08d50bb076218
Kyeongkab.Nam [Thu, 18 Oct 2018 21:38:41 +0000 (14:38 -0700)]
Merge "Change handling logic in SystemAudioAutoInitiationAction"
am:
e31990f54c
Change-Id: Ifbc111a3b01448f7eb35c4dc6b7ebb3be3331bfa
David Brazdil [Thu, 18 Oct 2018 21:25:12 +0000 (14:25 -0700)]
Merge "Add entries to hidden api greylist"
am:
7d044566c6
Change-Id: Id7966477ee57cd3a8d3b02c4772b6a572e3f5f1a
Xiangyu/Malcolm Chen [Thu, 18 Oct 2018 21:21:29 +0000 (14:21 -0700)]
Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants"
am:
1b59a1673a
Change-Id: I15c450d9ca7a71bfbde1ddd602e13473bede06b3
weichinweng [Thu, 18 Oct 2018 21:18:06 +0000 (14:18 -0700)]
Merge "AudioService: Add Hearing Aid Switch Control"
am:
f3b7821fbd
Change-Id: I6abbbc268a8c391e2d400e7a9811ea0e04362bfc
Eric Laurent [Thu, 18 Oct 2018 21:14:59 +0000 (14:14 -0700)]
Merge "audio: apply volume upon hearing aid device connection"
am:
7b9184bff4
Change-Id: Id79009433359321de2af226ca741aa912057e593
Hall Liu [Thu, 18 Oct 2018 20:36:06 +0000 (20:36 +0000)]
Merge "Add dynamic support for 4G/LTE/LTE+ icons"
Brad Ebinger [Tue, 9 Oct 2018 23:48:08 +0000 (16:48 -0700)]
Expose the empty MmTelCapabilities constructor
1) Allow for empty MmTelFeature.MmTelCapabilities to be
accessible via @SystemApi.
2) Add correct @nonnull/@nullable annotations as per API
review.
Bug:
117555643
Bug:
116117215
Test: Manual
Change-Id: Id445e4702f44528b4b1ab59129cf35803ae70053
sqian [Thu, 18 Oct 2018 18:57:01 +0000 (11:57 -0700)]
Fix current.txt
Bug:
113072551
Test: compile
Change-Id: I3e9d5ec0460eae13da88671e1e7cb873638352ee
Merged-In: I00720bc3f947adf3c1072c75a040e85333d317f5
Brad Ebinger [Thu, 18 Oct 2018 16:54:38 +0000 (16:54 +0000)]
Merge "Expose ImsExternalCallState constructor as @SystemApi"
Treehugger Robot [Thu, 18 Oct 2018 15:25:30 +0000 (15:25 +0000)]
Merge "CEC: Make TV try to dispatch the message first"
Treehugger Robot [Thu, 18 Oct 2018 15:04:30 +0000 (15:04 +0000)]
Merge "Change handling logic in SystemAudioAutoInitiationAction"
David Brazdil [Thu, 18 Oct 2018 13:34:59 +0000 (13:34 +0000)]
Merge "Add entries to hidden api greylist"
Xiangyu/Malcolm Chen [Thu, 18 Oct 2018 04:41:04 +0000 (04:41 +0000)]
Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants"
Treehugger Robot [Thu, 18 Oct 2018 04:24:05 +0000 (04:24 +0000)]
Merge "AudioService: Add Hearing Aid Switch Control"
Steven Moreland [Thu, 18 Oct 2018 01:16:51 +0000 (18:16 -0700)]
pm: Disallow HIDL libs from boot jars >= Q.
These two libraries:
android.hidl.base-V1.0-java
android.hidl.manager-V1.0-java
were removed from BOOT_JARS. This change disallows them to be used on
the classpath >= Q. They are still allowed to be used <= P for legacy
reasons.
Test: atest android.content.pm.AndroidHidlUpdaterTest
Test: build & boot Pixel 2
Fixes:
77307025
Change-Id: I7752812318030cbaa15f42301c168371ceade901
Shuo Qian [Thu, 18 Oct 2018 00:19:35 +0000 (17:19 -0700)]
Merge "Compare Emergency number display priority"
am:
a9d551ca7b
Change-Id: I59d2226ba82c67af80ebbd7f976991f1ed4ee8c4
Jean-Michel Trivi [Thu, 18 Oct 2018 00:15:00 +0000 (17:15 -0700)]
Merge "AudioService: log hearing aid connection and BECOMING_NOISY"
am:
ea008f1429
Change-Id: I8655f8f7f50c5e6af63a0d875a1d1d462434fcb9
Hall Liu [Thu, 18 Oct 2018 00:11:11 +0000 (17:11 -0700)]
Merge "Add new carrier configs for RTT"
am:
c6b2c9df68
Change-Id: I353d63a70d36cbac54ae0af826934409a6d67093
weichinweng [Tue, 9 Oct 2018 10:02:17 +0000 (18:02 +0800)]
AudioService: Add Hearing Aid Switch Control
1) Add setBluetoothHearingAidDeviceConnectionState interface to control
suppressNoisyIntent flag.
2) Add check to confirm the previous device is active or not when want
to clean it.
Bug:
112279820
Test: Build Pass, BT off/on when play A2DP, Switch active device
Change-Id: I73f1236d44213c6cf4a2708f3c96144416cfa67d
Treehugger Robot [Wed, 17 Oct 2018 23:26:26 +0000 (23:26 +0000)]
Merge "audio: apply volume upon hearing aid device connection"
Shuo Qian [Wed, 17 Oct 2018 22:12:02 +0000 (22:12 +0000)]
Merge "Compare Emergency number display priority"
Malcolm Chen [Thu, 11 Oct 2018 00:24:48 +0000 (17:24 -0700)]
Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants
Test: unittest
Bug:
112020101
Change-Id: Icdbda89fb103a4312855d14ab3a365b37564f164
Chenbo Feng [Wed, 17 Oct 2018 20:55:43 +0000 (13:55 -0700)]
Merge "Move bpf project to system/bpf"
am:
1006d271cc
Change-Id: I0a96a2abd66fd0cca4b49d773a6990a59134128a
Jean-Michel Trivi [Wed, 17 Oct 2018 20:51:17 +0000 (13:51 -0700)]
[automerger skipped] Merge "AudioService: history of A2DP commands"
am:
95a384daf7 -s ours
Change-Id: I4406df349e37f025187c35c05b8d59ced132a0d7
chen xu [Fri, 12 Oct 2018 22:30:34 +0000 (15:30 -0700)]
expose some Telephony.Carriers cols system APIs
Bug:
117473154
Test: Telephony unit test
Change-Id: I8e6b873842f42b8cb3244a14b6e6c5d9c1ae5318
Treehugger Robot [Wed, 17 Oct 2018 20:30:02 +0000 (20:30 +0000)]
Merge "AudioService: log hearing aid connection and BECOMING_NOISY"
Hall Liu [Wed, 17 Oct 2018 19:58:53 +0000 (19:58 +0000)]
Merge "Add new carrier configs for RTT"
Treehugger Robot [Wed, 17 Oct 2018 19:39:39 +0000 (19:39 +0000)]
Merge "Move bpf project to system/bpf"
Ajay Panicker [Wed, 17 Oct 2018 18:09:25 +0000 (11:09 -0700)]
Synchronize on a static final object to lock mDeviceBusy
Synchronizing on a field doesn't lock the object in a predictable way.
Bug:
63389270
Test: Compile
Change-Id: Idd3111bc94d32bc4bb320a5c25da37fe68276337
Jack Yu [Wed, 17 Oct 2018 17:44:06 +0000 (10:44 -0700)]
Merge "Supported v1.3 data profile"
am:
1e4f6fbe23
Change-Id: Ib7292e5de8ff39879244e4922412287c9f4ce9ab
Jean-Michel Trivi [Fri, 28 Sep 2018 21:22:15 +0000 (14:22 -0700)]
AudioService: log hearing aid connection and BECOMING_NOISY
Bug:
112279820
Test: adb shell dumpsys audio, look under "device connection"
Change-Id: Ibaf77a43649a7dd2bc1b9d9df34ba79fd88ef5be
(cherry picked from commit
cc11d500b6269a7e9512f559a89bbe8f18ef7344)
Merged-In: Ibaf77a43649a7dd2bc1b9d9df34ba79fd88ef5be
Treehugger Robot [Wed, 17 Oct 2018 17:43:07 +0000 (17:43 +0000)]
Merge "AudioService: history of A2DP commands"
Mathew Inwood [Wed, 17 Oct 2018 17:35:39 +0000 (10:35 -0700)]
Merge "Merge hidden API metadata into a single CSV file."
am:
5037a7eb93
Change-Id: I0efce89576b0ca7ae90d49de3455466a866521de
Brad Ebinger [Wed, 10 Oct 2018 17:54:56 +0000 (10:54 -0700)]
Expose ImsExternalCallState constructor as @SystemApi
1) Expose the ImsExternalCallState constructor as @SystemApi
so that vendors can use this class correctly.
2) Change the call ID from int->String to comply with RFC 4235.
Bug:
117555643
Bug:
115697579
Test: Manual
Change-Id: I980ec091c69d2b3179843bd8485955377b88712e
Jack Yu [Wed, 17 Oct 2018 15:56:41 +0000 (15:56 +0000)]
Merge "Supported v1.3 data profile"
Stanley Tng [Wed, 17 Oct 2018 15:33:44 +0000 (08:33 -0700)]
resolve merge conflicts of
23ccecc4ca9f58139baa72bd4783451b780b1eb5 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5fbdb4b246cc34ac5c6fcfe39e41a16137e9f9ab
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
David Brazdil [Thu, 11 Oct 2018 14:06:53 +0000 (15:06 +0100)]
Add entries to hidden api greylist
Bug:
116509788
Test: m appcompat
Change-Id: I5a1977fdeacab3f4aa3a7104c26931a2fcb21b20