Commit Graph

376859 Commits

Author SHA1 Message Date
Seigo Nonaka
52a4c07f7c Revert "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE"
This reverts commit 155951f2f6.

Reason for revert: broke test in pi-dev/stage-aosp-master

Change-Id: I917e170b570b89ba2e8a26cec0bf0a8adf577b80
2018-10-25 18:23:32 +00:00
Seigo Nonaka
155951f2f6 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
2018-10-24 05:57:57 +00:00
Chen Xu
e09f7b5ebb Merge "Need to check empty not null for String" 2018-10-22 16:53:18 +00:00
Chen Xu
fccdf46adf Merge changes from topic "carrier_id_aosp_cp"
* changes:
  support mno carrier id
  support privilege access rule for carrier identification
2018-10-22 16:36:25 +00:00
Paul Duffin
bb58511bcb Merge "Remove more libcore classes from light grey/vendor lists" 2018-10-22 14:47:33 +00:00
Paul Duffin
c3bf3e4e14 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
2018-10-22 13:12:15 +01:00
Treehugger Robot
35d9291ca7 Merge "Reduce excess local prefix computations" 2018-10-22 08:04:41 +00:00
Treehugger Robot
06182b0764 Merge "pm: Disallow HIDL libs from boot jars >= Q." 2018-10-22 07:08:10 +00:00
markchien
69955497d4 Reduce excess local prefix computations
only recomputing on the LISTEN_ALL callback

Test: - build, flash, booted
      - runtest frameworks-net

bug: 110335330

Change-Id: I606574f1a8a2899ed4688d7d5ec2cbe0f2638a94
2018-10-22 12:37:42 +09:00
Neil Fuller
03c766075d Merge "Remove explicit dependencies on core library" 2018-10-21 18:10:48 +00:00
chen xu
6d4f5b2280 support mno carrier id
Bug: 110559381
Test: CarrierResolverTest.testMnoCarrierId
Change-Id: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
Merged-in: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
2018-10-20 22:25:10 -07:00
fionaxu
e9c6da7b12 support privilege access rule for carrier identification
Bug: 69807697
Bug: 72665237
Test: Manual
Change-Id: I5e00302684b2be93ee956d43b04ca9a12d043158
Merged-in: I5e00302684b2be93ee956d43b04ca9a12d043158
2018-10-20 22:22:18 -07:00
Neil Fuller
0e9ac83e04 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
2018-10-20 09:20:00 +01:00
Treehugger Robot
c558f4cedf Merge "Fix FD leak during ADB shell install." 2018-10-20 07:25:24 +00:00
Treehugger Robot
46049f5fec Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." 2018-10-20 01:08:55 +00:00
Chih-hung Hsieh
dd68cf76de Merge "Allow implicit-fallthrough warnings locally." 2018-10-20 00:44:34 +00:00
Treehugger Robot
8f520e6f83 Merge "Fix implicit-fallthrough warnings." 2018-10-20 00:15:20 +00:00
Chih-Hung Hsieh
df891f8a31 Fix implicit-fallthrough warnings. DO NOT MERGE.
These changes are not needed in goog/master.

Test: make checkbuild
Bug: 112564944
Change-Id: I75972e680c9502e1b83845f08e79b99a8084cc4c
2018-10-19 15:32:26 -07:00
Dan Shi
50242ce28a Merge "Mark 4 tests as FlakyTest" 2018-10-19 22:13:34 +00:00
Dan Shi
2192b50a29 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
2018-10-19 14:25:36 -07:00
Bill Yi
04d53e2611 Merge "Merge pi-dr1-dev to aosp-master" 2018-10-19 21:19:30 +00:00
Chih-Hung Hsieh
672a4fd863 Fix implicit-fallthrough warnings.
Test: make checkbuild
Bug: 112564944
Change-Id: Iaebada5e1a5d94ed06d9b584b888a4f78c0b8505
2018-10-19 14:19:29 -07:00
Brad Ebinger
7fff7e5eff Merge "Expose the empty MmTelCapabilities constructor" 2018-10-19 20:20:14 +00:00
Treehugger Robot
1868b7eec8 Merge "Remove resources for 4G/LTE/LTE+ icons" 2018-10-19 19:26:20 +00:00
Bill Yi
0b537c73f7 Merge pi-dr1-dev to aosp-master
Change-Id: I40fca8b785049f8563809a70f6671b8af89f3cfd
2018-10-19 12:20:31 -07:00
Treehugger Robot
2c10a29eaa Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED" 2018-10-19 19:19:26 +00:00
Chih-Hung Hsieh
8767a4ede6 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
2018-10-19 12:13:48 -07:00
Chen Xu
7dd38c2115 Merge "new SystemAPI for setCarrierDataEnabled" 2018-10-19 18:47:27 +00:00
Chen Xu
a18e095754 Merge "Revert "Telephony light grey list clean up for Q"" 2018-10-19 18:36:56 +00:00
Niklas Lindgren
2132595d59 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
2018-10-19 18:23:44 +00:00
chen xu
b591f9d2dd 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
2018-10-19 18:18:39 +00:00
Chen Xu
bb0689b6d5 Merge "expose some Telephony.Carriers cols system APIs"
am: f2e0f57976

Change-Id: Ifbceb368352aa1f57912b6690f61fe8412e2dc41
2018-10-19 11:13:04 -07:00
Chen Xu
bab59cb9db Revert "Telephony light grey list clean up for Q"
This reverts commit 253bdb7175.

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
2018-10-19 18:05:32 +00:00
Stanley Tng
76439a1665 Merge "Fix missing connection state changes intent for Hearing Aids"
am: 4c7123f8e3

Change-Id: I8fd60c7a9e1458c9d391407cd53c9cd56fb5509d
2018-10-19 10:59:53 -07:00
Chen Xu
f2e0f57976 Merge "expose some Telephony.Carriers cols system APIs" 2018-10-19 17:56:14 +00:00
Youming Ye
130aacd566 Merge changes from topic "cherrypick"
am: c4b647458c

Change-Id: Id372458d932eb34db2f7cdc5bc25159f65f1d93c
2018-10-19 10:15:55 -07:00
Treehugger Robot
4c7123f8e3 Merge "Fix missing connection state changes intent for Hearing Aids" 2018-10-19 17:09:34 +00:00
SongFerngWang
dd86ea6036 add four new carrier configs for supplementary service precautions.
am: 7e7c7d2abf

Change-Id: If9d738a3c9632410dc913ed08109b975e90b36a2
2018-10-19 10:08:46 -07:00
Youming Ye
c4b647458c 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.
2018-10-19 16:33:22 +00:00
Junyu Lai
43d8774f68 Merge "Add tests for the network blocked status change"
am: af0de1a2e9

Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e
2018-10-19 09:18:38 -07:00
Junyu Lai
745952eac8 Merge "Add new callback to inform blocking of network on specific uid."
am: f709e754ab

Change-Id: Ia99ee2fbefa67a7ee00d6fecce430ba6431945cd
2018-10-19 09:14:23 -07:00
Junyu Lai
af0de1a2e9 Merge "Add tests for the network blocked status change" 2018-10-19 15:20:48 +00:00
Junyu Lai
f709e754ab Merge "Add new callback to inform blocking of network on specific uid." 2018-10-19 15:20:48 +00:00
Chalard Jean
86ff3f4c7a Merge "Fix a bug where Uri can't parse IPv6 literal addresses."
am: 54677a86d4

Change-Id: Ibf681262344904990f77f9016f3ffc9efbce08ba
2018-10-19 05:10:55 -07:00
Mike Yu
f9729757f9 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
2018-10-19 19:52:50 +08:00
Treehugger Robot
54677a86d4 Merge "Fix a bug where Uri can't parse IPv6 literal addresses." 2018-10-19 11:04:29 +00:00
Chuanghua Zhao
b584c6eb8c 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
2018-10-19 08:28:55 +00:00
Stanley Tng
3b24d97130 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
2018-10-19 07:05:41 +00:00
Mathieu Chartier
96cb6d97e1 Merge "Sleep 1s before force stop and use killBackgroundApp"
am: 2417859fa5

Change-Id: I92d83f16123dd16f68eb0d95d83f9dbabd493d01
2018-10-18 23:52:16 -07:00
sqian
26c2c5e50d Merge "Fix current.txt"
am: 2810d0ae3e

Change-Id: I67eca70fe8d4ef7700e547de54be6d03aca492c7
2018-10-18 23:41:46 -07:00