OSDN Git Service
android-build-prod (mdb) [Wed, 9 May 2018 19:19:06 +0000 (12:19 -0700)]
Merge "AudioService: Do not disconnect SCO started externally"
am:
391d919622
Change-Id: Iebcdb6d451755993cfee81250721a03b0f378edf
android-build-prod (mdb) [Wed, 9 May 2018 17:52:34 +0000 (17:52 +0000)]
Merge "AudioService: Do not disconnect SCO started externally"
Tyler Gunn [Wed, 9 May 2018 17:35:20 +0000 (10:35 -0700)]
Merge "Make TelecomManager#endCall a public API."
am:
d63982cc03
Change-Id: Iea39f42a96cb004cf69caaf5ba732d3b14060336
Tyler Gunn [Wed, 9 May 2018 16:22:44 +0000 (16:22 +0000)]
Merge "Make TelecomManager#endCall a public API."
David Brazdil [Wed, 9 May 2018 16:10:31 +0000 (09:10 -0700)]
Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b
am:
6982bf4bde
Change-Id: If80460dad9656f1bdad492a951f1e7247799e7b1
David Brazdil [Wed, 9 May 2018 14:51:37 +0000 (07:51 -0700)]
Merge "Revert^2 "Fix signature of recently changed methods""
am:
3a603777ba
Change-Id: I3997c82d48b94118a11928ec10e664acc6607fd3
David Brazdil [Wed, 9 May 2018 13:58:50 +0000 (13:58 +0000)]
Merge changes I8b20e03c,Id1ef4ab5,Ie34adb8b
* changes:
Manualy blacklist certain hidden APIs
Populate hidden API dark greylist
Refactor build rules for hidden API lists
David Brazdil [Wed, 9 May 2018 13:40:55 +0000 (06:40 -0700)]
[automerger skipped] Merge "Revert "Fix signature of recently changed methods""
am:
89a4b96b9c -s ours
Change-Id: I4f5c4d87f419cafc44b6f93a24a29720db744d06
David Brazdil [Wed, 9 May 2018 12:42:30 +0000 (12:42 +0000)]
Merge "Revert^2 "Fix signature of recently changed methods""
David Brazdil [Wed, 9 May 2018 12:35:20 +0000 (12:35 +0000)]
Revert^2 "Fix signature of recently changed methods"
This reverts commit
29b92c610a61f88ebf25e764994b70d61bc3cea8.
Merge the CL again, this time without a Merged-In flag which
prevented it from merging into the internal tree.
Change-Id: Ie1b9de8c45cb174437fa4acdd78e6cdd4b660623
David Brazdil [Wed, 9 May 2018 12:32:28 +0000 (12:32 +0000)]
Merge "Revert "Fix signature of recently changed methods""
David Brazdil [Wed, 9 May 2018 12:27:27 +0000 (12:27 +0000)]
Revert "Fix signature of recently changed methods"
This reverts commit
ca930d166ec2b3d20a8abc03aaabb7874a6c7745.
Reason for revert: the Merged-In tag conflicts with
a cherry-pick into AOSP
Merged-In: Id50db88f4ff36069b0f392c81dd9d90c24cd2206
Change-Id: If284ac4957cf84f0acc118f232f6acf476e05b98
David Brazdil [Wed, 9 May 2018 10:54:32 +0000 (03:54 -0700)]
[automerger skipped] Merge "Fix signature of recently changed methods"
am:
4b2f7576a0 -s ours
Change-Id: Ib0085e2a127a1b70be98b66b898b7fa04741f512
David Brazdil [Wed, 9 May 2018 10:07:11 +0000 (03:07 -0700)]
Merge changes from topic "hiddenapi-cherrypick"
am:
b54f2acc72
Change-Id: I378f50fd4f6290518fd9a39d4c4eb1e972e3d60e
David Brazdil [Wed, 9 May 2018 10:02:48 +0000 (03:02 -0700)]
Populate hidden API light greylist for AOSP
am:
cfeb1c8b88
Change-Id: If2dae23b6e06339f0f6d214bb7d4cd3abb8d13a8
David Brazdil [Wed, 9 May 2018 09:58:08 +0000 (02:58 -0700)]
Add presubmit hook for hidden API lists.
am:
2200a1b83b
Change-Id: Ic12ae5fba32e9df9e7f31910593e07690f47c35d
Mathew Inwood [Wed, 9 May 2018 09:52:35 +0000 (02:52 -0700)]
Fix typo in comments.
am:
40f67c52bb
Change-Id: I0727a3755f5fb46c5d4d43bed9f1628c82f5190d
Mathew Inwood [Wed, 9 May 2018 09:45:54 +0000 (02:45 -0700)]
Treat hidden API exemptions as whitelist.
am:
5449fc727f
Change-Id: I878f1582ee7b5d0f52425be796b4dfcef789a96d
David Brazdil [Wed, 9 May 2018 09:43:46 +0000 (09:43 +0000)]
Merge "Fix signature of recently changed methods"
Mathew Inwood [Wed, 9 May 2018 09:38:34 +0000 (02:38 -0700)]
Replace ALL_LISTS policy with JUST_WARN.
am:
a4ba0e442a
Change-Id: I423212d16d0c453f31ae6e82f8333d5b633ed78b
David Brazdil [Wed, 9 May 2018 09:10:18 +0000 (10:10 +0100)]
Fix signature of recently changed methods
BluetoothHeadset methods startScoUsingVirtualVoiceCall and
stopScoUsingVirtualVoiceCall recently changed their signature.
Fix this in the hiddenapi-light-greylist.txt to unblock the build.
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Merged-In: Id50db88f4ff36069b0f392c81dd9d90c24cd2206
Change-Id: I295886b0cd35936d0b8c1a8e4a9b9c5054dda001
David Brazdil [Tue, 8 May 2018 15:49:02 +0000 (16:49 +0100)]
Manualy blacklist certain hidden APIs
Previous CL introduced the concept of populating the dark greylist
with remaining members of classes on the light greylist. This breaks
the assumption that some methods/fields will always remain blacklisted.
Introduce a new file which forces their blacklisting and adjust the
build rules accordingly.
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Merged-In: I8b20e03c50f4027a24d2a6081bedb08bc8a34011
Change-Id: I8b20e03c50f4027a24d2a6081bedb08bc8a34011
(cherry picked from commit
4b34f79a35a6602962ed1df1accd9d6ea6e41e77)
David Brazdil [Tue, 8 May 2018 14:28:31 +0000 (15:28 +0100)]
Populate hidden API dark greylist
This patch will iterate over all classes in the light greylist and
add the remaining (currently blacklisted) class members into the
dark greylist. This is meant to mitigate the impact of the feature
on legacy apps, in case their hidden API uses have not been detected
by our analyses. The dark greylist entries will be available to apps
targeting pre-P SDK versions, but blocked for apps targeting P or later.
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-dark-greylist.txt
Merged-In: Id1ef4ab523b3b4d1333b5fbf2b3e6622ef2be607
Change-Id: Id1ef4ab523b3b4d1333b5fbf2b3e6622ef2be607
(cherry picked from commit
185f00e6677cea3fb135648f4a19d22dec54bbb5)
David Brazdil [Tue, 8 May 2018 14:04:20 +0000 (15:04 +0100)]
Refactor build rules for hidden API lists
The build rules were getting messy and too difficult to extend.
Extract assertions into own functions, create shared variables.
Bug:
64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Merged-In: Ie34adb8b5349b30daa2e9e4976d285f6d9711f0e
Change-Id: Ie34adb8b5349b30daa2e9e4976d285f6d9711f0e
(cherry picked from commit
721bc8e6a8b1350c62b4a570f523541d1ce1124a)
David Brazdil [Wed, 9 May 2018 08:10:19 +0000 (08:10 +0000)]
Merge changes from topic "hiddenapi-cherrypick"
* changes:
Enable hidden API blacklist in AOSP
Populate hidden API light greylist for AOSP
Add presubmit hook for hidden API lists.
Fix typo in comments.
Treat hidden API exemptions as whitelist.
Replace ALL_LISTS policy with JUST_WARN.
Calin Juravle [Wed, 9 May 2018 03:39:02 +0000 (20:39 -0700)]
Merge "Process "dalvik.vm.profilebootimage" system property"
am:
dc3fe53d4f
Change-Id: I1ea3abc828c4fa3fc5359f7c63664084f31d9eb7
Jack He [Tue, 8 May 2018 21:51:07 +0000 (14:51 -0700)]
AudioService: Do not disconnect SCO started externally
* AudioService should not disconnect Bluetooth SCO if it is started
externally
* When SCO has already started externally, all SCO connection attempts
through AudioManager API will fail with SCO_AUDIO_STATE_DISCONNECTED
intent
* Remove SCO_STATE_DEACTIVATE_EXT_REQ state since AudioService could no
longer disconnect SCO audio that is started externally
* Change SCO_STATE_* values so that they are consecutive
Bug:
79407565
Test: With Bluetooth HFP device connected:
Test1: make a outgoing call
Test2: make VoIP call during cellular call
Test3: make a VoIP call during another VoIP call
Change-Id: I1e0a10aeb0eac59d4826f9defa595aebd85f534c
(cherry picked from commit
33c3a17113ee93bfd4575241cc15e78afc300f0e)
Remi NGUYEN VAN [Wed, 9 May 2018 02:33:38 +0000 (19:33 -0700)]
Merge "Add NETWORK_BYPASS_PRIVATE_DNS permission"
am:
50e7fe7831
Change-Id: I368bbdf5b222eba7d0d300ced640639531f51482
Calin Juravle [Wed, 9 May 2018 01:55:51 +0000 (01:55 +0000)]
Merge "Process "dalvik.vm.profilebootimage" system property"
android-build-prod (mdb) [Wed, 9 May 2018 01:37:29 +0000 (18:37 -0700)]
Merge "Bluetooth: Fix HFP SCO logic and documentation"
am:
9c4593243c
Change-Id: I86b54d8d05be040eb2273e83f25201e0f2b005a1
Remi NGUYEN VAN [Wed, 9 May 2018 01:29:34 +0000 (01:29 +0000)]
Merge "Add NETWORK_BYPASS_PRIVATE_DNS permission"
android-build-prod (mdb) [Wed, 9 May 2018 00:25:12 +0000 (00:25 +0000)]
Merge "Bluetooth: Fix HFP SCO logic and documentation"
android-build-prod (mdb) [Tue, 8 May 2018 23:27:07 +0000 (16:27 -0700)]
Merge "Update the Open Mobile API version"
am:
cf54a958db
Change-Id: If5f611b074e3ee855d58878688333d1031e6fa93
android-build-prod (mdb) [Tue, 8 May 2018 22:22:13 +0000 (22:22 +0000)]
Merge "Update the Open Mobile API version"
Calin Juravle [Tue, 8 May 2018 19:42:30 +0000 (12:42 -0700)]
Process "dalvik.vm.profilebootimage" system property
Read the profile boot image property and pass the appropriate flags to the
android runtime.
Test: build, flash and check properties
Bug:
73313191
Change-Id: Ie972e2eb693678d268e707b9e892c97dd7dd061b
Tyler Gunn [Wed, 2 May 2018 20:23:48 +0000 (13:23 -0700)]
Make TelecomManager#endCall a public API.
A broad category of apps such as wearable companion apps and call blocking
apps rely on the ability to reject a ringing call.
Previously this was achieved using a broken TelephonyManager API which
lacked permission checks.
To support these applications, removing the @hide attribute on the existing
TelecomManager#endCall API so that apps with the existing
ANSWER_PHONE_CALLS permission can reject ringing calls and end ongoing
calls. Logically if an app has permission to answer a call, it should be
able to end it.
Test: Created test app to verify API permission checks.
Test: Added new CTS tests to cover this API.
Bug:
78290258
Merged-In: Ic6527969793ebe05eb9c5fa8205558ae788ea572
Change-Id: Ic6527969793ebe05eb9c5fa8205558ae788ea572
David Brazdil [Sat, 5 May 2018 10:43:29 +0000 (11:43 +0100)]
Enable hidden API blacklist in AOSP
The CL copies the build rule for hidden API lists from the internal
tree to AOSP. This is not a cherry-pick but it will make the rules
the same in all the branches. As a result, the blacklist becomes
enabled in AOSP.
Test: make
Merged-In: I8757a66bf625388e6f6419714ef5bba7af5d93ea
Change-Id: I567c10dc8e833aa0a6775ab91f2ce9553b0dd8df
David Brazdil [Tue, 8 May 2018 11:40:31 +0000 (12:40 +0100)]
Populate hidden API light greylist for AOSP
This patch adds the light greylist and vendor list source files from
the internal tree, intersected with the full list of private APIs
in AOSP. This is a prerequisite for enabling the blacklist.
The CL is not merged into internal master.
Test: N/A
Change-Id: I41442574fff6894cd1cb004abc5101210cfb86ba
Merged-In: I8757a66bf625388e6f6419714ef5bba7af5d93ea
David Brazdil [Sat, 5 May 2018 11:07:38 +0000 (12:07 +0100)]
Add presubmit hook for hidden API lists.
Check that they're sorted as expected and contain no duplicates.
The sort order now uses:
$ LC_COLLATE=C sort -f
So that non-alphanumeric characters are not ignored, giving a more
intuitive sort order. the '-f' means ignore case.
Also sort the existing lists accordingly.
Test: repo upload
Bug:
64382372
Merged-In: I52b884da33a9a46455df6747a215683d9d3c3218
Change-Id: Icc124fd8ceb3f001a9c11bbf40e0a111910c6b39
(cherry picked from commit
e5dc64d4281dd9f38c2b585202e26ae4278fcfc5)
Mathew Inwood [Fri, 6 Apr 2018 12:53:45 +0000 (13:53 +0100)]
Fix typo in comments.
Keep the nitpickers happy.
Test: m
Bug:
77517571
Merged-In: I70374c05df3e366b5a0ce3bbb103dce28f48d4b8
Change-Id: I70374c05df3e366b5a0ce3bbb103dce28f48d4b8
(cherry picked from commit
5e986dccfd96876d9e07bf779237b10bf9985b28)
Mathew Inwood [Thu, 5 Apr 2018 12:56:39 +0000 (13:56 +0100)]
Treat hidden API exemptions as whitelist.
Update docs accordingly.
Test: m
Bug:
64382372
Merged-In: Ief8daf3badeb046b0461a3ebcd289e242d559070
Change-Id: Ief8daf3badeb046b0461a3ebcd289e242d559070
(cherry picked from commit
33d5138e132561d6c3c02fc0e265aa3c158f6798)
Mathew Inwood [Thu, 5 Apr 2018 14:44:20 +0000 (15:44 +0100)]
Replace ALL_LISTS policy with JUST_WARN.
It seems pretty unlikely that we'd ever want to disallow access to the
light greylist in P, since doing do would break do many apps. We don't need
this policy here as an opt-in for apps now, since the StrictMode work will
achieve the same thing.
Instead, make a "just warn" policy which allows access to all APIs, but
leaves the detection and logging logic in place. This gives us the option
of disabling enforcement, but still gathering logs to find out which apps
use which APIs.
Bug:
77517571
Test: Boot device
Test: Hardcode policy of HIDDEN_API_ENFORCEMENT_JUST_WARN and verify log
Merged-In: I588f347716a79ac5887b74763c8afc16b3be699b
Change-Id: I588f347716a79ac5887b74763c8afc16b3be699b
(cherry picked from commit
a6d02fb1041bf19161fd4d74bcf5a1cd87495245)
Remi NGUYEN VAN [Tue, 8 May 2018 09:00:59 +0000 (02:00 -0700)]
Merge "Fix testRegisterUsageCallback"
am:
d0b9f983d6
Change-Id: I7ec1e3a05971e8e0448289e3c3f979fd7dcfe144
Remi NGUYEN VAN [Tue, 8 May 2018 07:55:42 +0000 (07:55 +0000)]
Merge "Fix testRegisterUsageCallback"
Remi NGUYEN VAN [Tue, 8 May 2018 05:24:56 +0000 (22:24 -0700)]
Merge "Fix testUidPoliciesToString"
am:
c8613f9965
Change-Id: I3ec2fd01ca55ef63d0bfe0cec48854f852c736cc
Remi NGUYEN VAN [Tue, 8 May 2018 04:13:07 +0000 (04:13 +0000)]
Merge "Fix testUidPoliciesToString"
Remi NGUYEN VAN [Wed, 25 Apr 2018 08:46:10 +0000 (17:46 +0900)]
Add NETWORK_BYPASS_PRIVATE_DNS permission
Have the captive portal app and the MMS service use this new permission
to bypass private DNS.
This cherry-pick does not have the TODO and #SystemApi comments
deemed unnecessary in the original change.
Bug: b/
78494660
Test: manual: captive portal login works
Merged-In: I0d3429faddc0509781c896608039e4143cb1e8fd
Merged-In: I77bec89592c594392e94da001f1e3992543b23ec
(cherry-pick of I0a4a8d0105becf6957fd44099bd84eca51e6716f, manual merge)
Change-Id: I041d123ccd9bb1af730a97707cce9003b552cffa
android-build-prod (mdb) [Tue, 8 May 2018 01:13:01 +0000 (18:13 -0700)]
Merge "Convert android.test.runner.stubs to Soong"
am:
6fa8d06c78
Change-Id: I35d8b4836e58092a2c9158c493af8653e7ffb021
android-build-prod (mdb) [Mon, 7 May 2018 23:50:18 +0000 (23:50 +0000)]
Merge "Convert android.test.runner.stubs to Soong"
android-build-prod (mdb) [Mon, 7 May 2018 21:22:49 +0000 (14:22 -0700)]
Merge "Move SettingsLib tests and EasterEgg to aapt2."
am:
846fbd0806
Change-Id: I4d616697988a569b53d0dec1e4b674e455ae1307
android-build-prod (mdb) [Mon, 7 May 2018 20:05:54 +0000 (20:05 +0000)]
Merge "Move SettingsLib tests and EasterEgg to aapt2."
Jack He [Thu, 3 May 2018 02:10:56 +0000 (19:10 -0700)]
Bluetooth: Fix HFP SCO logic and documentation
AudioService:
* Call setBtScoActiveDevice and setBluetoothScoOn both in AudioService's
broadcast receiver so that these two methods must be triggerred in
the same sequence as ACTIVE_DEVICE_CHANGED and AUDIO_STATE_CHANGED
intents are sent and we no longer need to handle race condition by
synchronously checking active device in setBluetoothScoOn
* Default sco audio mode when no headset is active should be virtual
voice call, as many HFP devices do not accept SCO audio without an
ongoing call
* Synchronize checkScoAudioState() method with mScoClients
* Add helper functions connectBluetoothScoHelper and
disconnectBluetoothScoHelper to call various SCO setup and tear down
methods based on sco audio mode
* Try raw, virtual call, and voice recognition mode when disconnecting
externally started SCO
* Add new sco state SCO_STATE_DEACTIVATING to allow back to back calling
of startBluetoothSco and stopBluetoothSco
Audio Manager:
* Modified AudioManager logic so that removed devices callback is called
before newly added devices
BluetoothHeadset:
* Modified BluetoothHeadset so that start and stop SCO using virtual
voice call no longer need a parameter and will use active device by
default
* Modified documentation around various sco mangement APIs to match
their expected behaviors
Bug:
76114959
Test: VoIP calls sanity test cases
Change-Id: Id50db88f4ff36069b0f392c81dd9d90c24cd2206
(cherry picked from commit
89f979849a5cf2fa4e16d4f24ab41409f16a9956)
Colin Cross [Mon, 7 May 2018 19:26:15 +0000 (12:26 -0700)]
Merge changes from topic "soong_support_libs"
am:
3e20d23cf7
Change-Id: Iafd7255c47e296f3054466c35af8e19a6566879f
Aurimas Liutikas [Mon, 7 May 2018 19:21:45 +0000 (12:21 -0700)]
Migrate PrintSpooler to aapt2.
am:
d6c9658d99
Change-Id: I64afdc062304c04a8f28d56cad0d4b32ba3c9d10
Alan Viverette [Mon, 7 May 2018 19:16:58 +0000 (12:16 -0700)]
Migrate to AAPT2
am:
2789e544f1
Change-Id: I2b506b69bb0822cd22d38516e65896e74495a689
Aurimas Liutikas [Wed, 6 Dec 2017 00:20:43 +0000 (16:20 -0800)]
Move SettingsLib tests and EasterEgg to aapt2.
Test: make -j SettingsLibTests
Change-Id: I38fbd6af7eb5707d76fb930b4d685e30b26f45de
Merged-In: I38fbd6af7eb5707d76fb930b4d685e30b26f45de
(cherry picked from commit
41df109aca81726554d2aedf4ebea6c98f663273)
Colin Cross [Mon, 7 May 2018 17:53:09 +0000 (17:53 +0000)]
Merge changes from topic "soong_support_libs"
* changes:
convert Uibench test to aapt2
Migrate PrintSpooler to aapt2.
Migrate to AAPT2
android-build-prod (mdb) [Sat, 5 May 2018 15:50:28 +0000 (08:50 -0700)]
Merge "Convert to Soong"
am:
b466949e32
Change-Id: I3572e751c4f5da7e57fed17a39c481c51d4c758b
android-build-prod (mdb) [Sat, 5 May 2018 14:43:45 +0000 (14:43 +0000)]
Merge "Convert to Soong"
Dan Willemsen [Sat, 5 May 2018 06:17:00 +0000 (23:17 -0700)]
Convert to Soong
See build/soong/README.md for more information.
Test: cd frameworks/base/cmds/backup mma
Change-Id: I88a45ae568f80228c70f3e4a4a1facaff9520587
android-build-prod (mdb) [Sat, 5 May 2018 00:43:19 +0000 (17:43 -0700)]
Merge "AudioService: fix uid check in setBluetoothScoOn"
am:
b0ae3e5bfc
Change-Id: I23881555ddb5ce6ade6b868c0ebd7f5fc7f61169
android-build-prod (mdb) [Fri, 4 May 2018 23:19:19 +0000 (23:19 +0000)]
Merge "AudioService: fix uid check in setBluetoothScoOn"
Andreas Gampe [Fri, 4 May 2018 23:05:25 +0000 (16:05 -0700)]
Merge "Framework: Remove ART tombstoned config"
am:
95c5e5c1fd
Change-Id: I354faa8fba62ccbf387a45e993dd482293a9933e
Andreas Gampe [Fri, 4 May 2018 22:02:14 +0000 (22:02 +0000)]
Merge "Framework: Remove ART tombstoned config"
Jack Yu [Fri, 4 May 2018 18:37:39 +0000 (11:37 -0700)]
Merge "Enabled area info update for India"
am:
72cf718d20
Change-Id: Iebf82433948808948cc11f74104f5a3aee340475
Jack Yu [Fri, 4 May 2018 16:52:01 +0000 (16:52 +0000)]
Merge "Enabled area info update for India"
Aurimas Liutikas [Sat, 6 Jan 2018 00:27:23 +0000 (16:27 -0800)]
Migrate PrintSpooler to aapt2.
Test: make -j PrintSpooler
Change-Id: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4
Merged-In: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4
(cherry picked from commit
87f7ce4bd17b4d1cd0721b7b0d05f57ffdef8a0d)
Alan Viverette [Fri, 23 Mar 2018 18:33:43 +0000 (14:33 -0400)]
Migrate to AAPT2
Bug:
73128633
Test: make checkbuild
Change-Id: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
Merged-In: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff
(cherry picked from commit
e3264ba6cf7df5b33b10dd6a15ac5010c78bac6e)
Kirill Grouchnikov [Tue, 1 Aug 2017 13:35:13 +0000 (09:35 -0400)]
convert Uibench test to aapt2
Bug: NA
Test: build
Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
Merged-In: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
(cherry picked from commit
bffef1f024fbd7fb005a73d0744d7f8ee019fd27)
android-build-prod (mdb) [Thu, 3 May 2018 22:07:44 +0000 (15:07 -0700)]
Merge "Fix spelling errors in BluetoothGatt documentation"
am:
e7b05b8797
Change-Id: Iec4514c414dbaf7dcc3ff5a7b621ae9a4871c94c
Andreas Gampe [Thu, 3 May 2018 17:39:31 +0000 (10:39 -0700)]
Framework: Remove ART tombstoned config
The explicit option is no longer supported.
Bug:
77288304
Test: m
Test: device boots
Test: ANR dumps work
Change-Id: I1ffcf0593e1f6591d1b33882edf79381e59c2121
android-build-prod (mdb) [Thu, 3 May 2018 20:47:01 +0000 (20:47 +0000)]
Merge "Fix spelling errors in BluetoothGatt documentation"
Stanley Tng [Thu, 3 May 2018 15:50:49 +0000 (08:50 -0700)]
Fix spelling errors in BluetoothGatt documentation
Correct "paramter" to "parameter". Correct "connectoin" to connection.
Bug:
79198797
Test: Compile
Change-Id: I98646eec66da2aaa6f74ae2db35ea914c6a105a1
Jack Yu [Tue, 1 May 2018 20:53:51 +0000 (13:53 -0700)]
Enabled area info update for India
We only enabled for MCC 404 before. Now we enable
MCC 405 as well.
Test: Manual
Bug:
69725276
Merged-In: Icc42fe114195c08709a4e601d7fc139041ca878f
Change-Id: Icc42fe114195c08709a4e601d7fc139041ca878f
(cherry picked from commit
89081f4f61811e3a2078871aa1ef953a894f672a)
android-build-prod (mdb) [Thu, 3 May 2018 17:25:12 +0000 (10:25 -0700)]
Merge "Framework: Restrict warning message"
am:
1c4a22fb08
Change-Id: I6236d8f5a4433fa73c931679fdd2c071b726b0f1
David Brazdil [Thu, 3 May 2018 16:29:00 +0000 (09:29 -0700)]
Merge changes I4e13e5da,I68582cf0,I528a70cc
am:
01678299ce
Change-Id: I1bc454cbe71972b04c948c354ccaa7973831b5d0
android-build-prod (mdb) [Thu, 3 May 2018 15:31:18 +0000 (15:31 +0000)]
Merge "Framework: Restrict warning message"
David Brazdil [Thu, 3 May 2018 14:15:13 +0000 (14:15 +0000)]
Merge changes I4e13e5da,I68582cf0,I528a70cc
* changes:
Remove hiddenapi-blacklist.txt
Update hiddenapi-p-light-greylist.txt
Add rule to build hidden API blacklist
Erik Kline [Thu, 3 May 2018 12:05:05 +0000 (05:05 -0700)]
Merge "Add static IpClient logging"
am:
8285261133
Change-Id: Id566002382162a848de91b85559e69bc6f7ea28d
David Brazdil [Thu, 3 May 2018 09:57:45 +0000 (10:57 +0100)]
Remove hiddenapi-blacklist.txt
Create an empty file in the build rule instead. Do not merged this
beyond AOSP. We have an implicitly built blacklist everywhere else.
Bug:
64382372
Test: make
Change-Id: I4e13e5daf635934a152d389a95bf45c482b5a87f
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Erik Kline [Thu, 3 May 2018 10:44:30 +0000 (10:44 +0000)]
Merge "Add static IpClient logging"
David Brazdil [Thu, 3 May 2018 09:55:34 +0000 (10:55 +0100)]
Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I68582cf087b2e92f10b86c7c5a8bcd095e80ffab
David Brazdil [Wed, 2 May 2018 14:47:32 +0000 (15:47 +0100)]
Add rule to build hidden API blacklist
Add a new Makefile rule 'hiddenapi-b-blacklist' which takes the
manually published hiddenapi-p-light-greylist.txt and subtracts it
from private-dex.txt built for the current branch. This is meant to
provide an approximation of the blacklist in internal branches.
Bug:
64382372
Test: make hiddenapi-aosp-blacklist
Change-Id: I528a70cc6a71e988b53d94ca7ef81d6c181e5153
Erik Kline [Tue, 1 May 2018 07:51:44 +0000 (16:51 +0900)]
Add static IpClient logging
Support keeping IpClient logs around and dumping them
during dumpsys. Previously we got this benefit for
wifi by virtue of WifiStateMachine's long-lived nature.
Now that this is changing we need to be sure we have
logs, and this method gets us Ethernet logs as well.
Bug:
62476366
Bug:
77999594
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- dumpsys connmetrics [ipclient] works
Merged-In: Ib4daf0902cae91acadbe9965de1fb73c96a47bec
Merged-In: Ie947394fabcaca7fc1d067f095c2442ee2704593
Change-Id: I1136a83de8097fdb4130debe1eaf689be7132fe5
(cherry picked from commit
3f8306b8c56b58054800a576912204e8bf66f9f4)
android-build-prod (mdb) [Wed, 2 May 2018 22:49:21 +0000 (15:49 -0700)]
Merge "don't block adb while running uninstall"
am:
17280c61d3
Change-Id: Ida023bd6f9ba2b309e9443561f9fae43afea15fb
android-build-prod (mdb) [Wed, 2 May 2018 21:27:00 +0000 (21:27 +0000)]
Merge "don't block adb while running uninstall"
Vitor Albuquerque [Wed, 7 Mar 2018 13:39:59 +0000 (10:39 -0300)]
AudioService: fix uid check in setBluetoothScoOn
Calling UID is now checked in setBluetoothScoOn and only allow
route to change if request comes from a system component.
The check was not taking into account secondary users, hence
causing failure to route audio to SCO when secondary users
were active.
This change makes sure we are checking the correct app id,
without taking into account the user id.
Bug:
74057977
Test: SCO call using Guest User
Change-Id: I3e26dedb6333a85b315073fe4830c4d1b8070742
wangmingming1 [Tue, 10 Apr 2018 01:35:25 +0000 (09:35 +0800)]
don't block adb while running uninstall
Test: Manual
1. setup a work profile
2. set a uninstall restriction on foo app for the work profile
by calling set DevicePolicyManager.setUninstallBlocked()
3. observe adb uninstallation can return with 'DELETE_FAILED_OWNER_BLOCKED'
message without blocking forever by using the following command line:
`adb uninstall --user user-id-of-work-profile com.foo`
Test: Manual
1. install lots of apks via adb
2. uninstall apks via adb
Change-Id: I68706782ae547250433e3dd8ff285d4932473033
Merged-In: If89978c5a79ef998bde55c254ced4b6a3ff6e645
Signed-off-by: wangmingming1 <wangmingming1@xiaomi.com>
Anton Hansson [Wed, 2 May 2018 17:17:13 +0000 (10:17 -0700)]
Merge "frameworks/base: Update a few more references to android.jar."
am:
85e68063a9
Change-Id: I6338218432a1e9d3f99b392f6736fa6452809b82
Anton Hansson [Wed, 2 May 2018 15:31:27 +0000 (15:31 +0000)]
Merge "frameworks/base: Update a few more references to android.jar."
David Brazdil [Wed, 2 May 2018 11:48:44 +0000 (04:48 -0700)]
Merge "Build same hidden API lists as in pi-dev"
am:
c859c8097b
Change-Id: Ie11ef705d2e921ddecb845023c039e68f9633ea3
David Brazdil [Wed, 2 May 2018 10:40:37 +0000 (10:40 +0000)]
Merge "Build same hidden API lists as in pi-dev"
David Brazdil [Wed, 2 May 2018 10:36:39 +0000 (03:36 -0700)]
Merge "Publish hidden API light greylist from P"
am:
0835de9e17
Change-Id: I6c3f41abba7c96ffa93a446fa80951e95586feb5
David Brazdil [Thu, 26 Apr 2018 13:05:13 +0000 (14:05 +0100)]
Build same hidden API lists as in pi-dev
P branch builds hidden API lists in a separate invocation of droiddoc
which includes @SystemApi and @TestApi annotated class members in the
public API. This patch creates the same build rule in the master branch,
only with Soong instead of Makefile.
Test: make out/soong/.intermediates/frameworks/base/hiddenapi-lists/android_common/private-dex.txt
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: I80860c2b9f7213db65d0a9ca65bd645187aa0ce0
David Brazdil [Wed, 2 May 2018 08:42:49 +0000 (08:42 +0000)]
Merge "Publish hidden API light greylist from P"
Remi NGUYEN VAN [Wed, 2 May 2018 08:32:21 +0000 (17:32 +0900)]
Fix testUidPoliciesToString
The test is likely failing since go/ag/
1344349 because of a bad
copy-paste between patchsets 6 and 7.
Test: test now passes
Change-Id: I87341c4f4db1e7b61c3899368b24ea484fe8bfd1
Remi NGUYEN VAN [Tue, 24 Apr 2018 05:47:23 +0000 (14:47 +0900)]
Fix testRegisterUsageCallback
noteOp (introduced in go/ag/
3897834) checks that the calling uid matches
the calling package, which is not correct when using a fake calling
package. Use the real package of the test so permissions are checked
properly.
The test currently only fails this way in pi-dev as noteOp is only used
in pi-dev.
Change-Id: I9ac3717af9335ba9efa0b8842a2df0d7b69ec9ab
Test: Fixed test now passes in pi-dev
Bug: b/
78487385
android-build-prod (mdb) [Wed, 2 May 2018 02:41:39 +0000 (19:41 -0700)]
Merge changes from topic "ifaceStats"
am:
90c01b0093
Change-Id: I0b564b2d3b13c0e5d033c5cf4aaddad3a750f2c7
Chenbo Feng [Wed, 2 May 2018 02:36:30 +0000 (19:36 -0700)]
Use eBPF map data for per iface stats
am:
dcc56783f5
Change-Id: I9d6b930c8bb20f0bffd8eecee56ea7d3081b6f54
android-build-prod (mdb) [Wed, 2 May 2018 01:19:23 +0000 (01:19 +0000)]
Merge changes from topic "ifaceStats"
* changes:
Remove the unused file parsing function
Use eBPF map data for per iface stats