OSDN Git Service
Treehugger Robot [Fri, 11 May 2018 11:41:40 +0000 (11:41 +0000)]
Merge "Add static analysis data."
Nicolas Geoffray [Fri, 11 May 2018 10:08:01 +0000 (11:08 +0100)]
Add static analysis data.
bug:
64382372
Test: m
Change-Id: Ie0696a5eecf610165c4b9c339a789f76964a0623
Merged-in: I188a69ad05fffa69be79fec36b180fc9f76998fa
Jordan Liu [Thu, 10 May 2018 23:10:08 +0000 (23:10 +0000)]
Merge "Add documentation for what to use for SS changes"
Jordan Liu [Thu, 10 May 2018 22:56:27 +0000 (22:56 +0000)]
Merge "Update getIccAuthentication documentation"
Jordan Liu [Tue, 17 Apr 2018 21:43:39 +0000 (14:43 -0700)]
Add documentation for what to use for SS changes
Since the broadcast is deprecated in favor of the ServiceStateProvider,
the documentation should reflect this.
Note that the LteEarfcnRsrpBoost has not been migrated into the provider
so this also needs to happen.
Bug:
33756364
Fixes:
78188866
Test: no behavior change, ran make
Change-Id: Ia15a7408bdc79927438fa243cce77b262bbb66c4
Merged-In: Ia15a7408bdc79927438fa243cce77b262bbb66c4
Jordan Liu [Mon, 9 Apr 2018 23:33:17 +0000 (16:33 -0700)]
Update getIccAuthentication documentation
Explain what it means if the function returns null. This is based on the
spec at TS 31.102 section 7.3.1.
Bug:
74392381
Test: manual
Change-Id: Ic84d94589431109079a866027953ab9dbef103b8
Merged-In: Ic84d94589431109079a866027953ab9dbef103b8
Shuo Qian [Thu, 10 May 2018 20:56:06 +0000 (20:56 +0000)]
Merge "Enhance adding subscription logs"
sqian [Tue, 8 May 2018 21:11:11 +0000 (14:11 -0700)]
Enhance adding subscription logs
Bug:
79428110
Test: Manual
Change-Id: Ie77128f447ad0628336b2af38344d2d7a07f1eab
Merged-In: Ie77128f447ad0628336b2af38344d2d7a07f1eab
(cherry picked from commit
a77d9d7f2a733c67b471086f95fa3f7c70d6c1dc)
David Brazdil [Thu, 10 May 2018 15:46:56 +0000 (15:46 +0000)]
Merge "Greylist hidden methods for exempting trusted test code"
Remi NGUYEN VAN [Thu, 10 May 2018 00:11:21 +0000 (00:11 +0000)]
Merge "Fix android.net.SSLTest"
Treehugger Robot [Wed, 9 May 2018 23:26:23 +0000 (23:26 +0000)]
Merge "Bluetooth: Update grey list to match hidden API change"
Calin Juravle [Wed, 9 May 2018 22:12:42 +0000 (22:12 +0000)]
Merge "Properly prepare system server profiles"
Calin Juravle [Wed, 9 May 2018 22:12:07 +0000 (22:12 +0000)]
Merge "Make system server profiling an explicit runtime intent"
android-build-prod (mdb) [Wed, 9 May 2018 17:52:34 +0000 (17:52 +0000)]
Merge "AudioService: Do not disconnect SCO started externally"
David Brazdil [Wed, 9 May 2018 17:02:03 +0000 (18:02 +0100)]
Greylist hidden methods for exempting trusted test code
Bug:
64382372
Test: N/A
Change-Id: I8bcc3d23d0b942e70a16a9d28ea0d21ce4fe75a2
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 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 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 09:43:46 +0000 (09:43 +0000)]
Merge "Fix signature of recently changed methods"
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.
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)
Jack He [Wed, 9 May 2018 02:35:31 +0000 (19:35 -0700)]
Bluetooth: Update grey list to match hidden API change
* startScoUsingVirtualVoiceCall() and stopScoUsingVirtualVoiceCall()
no longer takes arguments
Bug:
76114959
Test: build only, no functional change
Change-Id: I16e5345bbfaa5d42490122a4330673e1152f687f
Calin Juravle [Wed, 9 May 2018 01:55:51 +0000 (01:55 +0000)]
Merge "Process "dalvik.vm.profilebootimage" system property"
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 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 07:55:42 +0000 (07:55 +0000)]
Merge "Fix testRegisterUsageCallback"
Remi NGUYEN VAN [Tue, 8 May 2018 02:23:56 +0000 (11:23 +0900)]
Fix android.net.SSLTest
The test is failing because of lack of visibility (IllegalAccessError).
Also rename it to match the tested class, migrate to JUnit4, and remove
an old test that is unused (suppressed), relies on third-party servers
and is not a proper unit test (would try to make real network requests).
Test: test now passes
Change-Id: I5032a056df83d4f572d89860b52bd85a1993d9dc
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) [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 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)
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 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
Calin Juravle [Thu, 3 May 2018 06:39:19 +0000 (23:39 -0700)]
Properly prepare system server profiles
Update the logic for system server profiles to work without disabling
SELinux policies.
Test: check that system_server profile is created without disabling
SElinux
Bug:
74081010
(cherry picked from commit
3f3a08ad0d93e29703597f780ff7d1b3b4a1facb)
Merged-Id: I63ffadfbe6850992634d0720fb077a4dc65b5736
Change-Id: I63ffadfbe6850992634d0720fb077a4dc65b5736
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 22:02:14 +0000 (22:02 +0000)]
Merge "Framework: Remove ART tombstoned config"
Jack Yu [Fri, 4 May 2018 16:52:01 +0000 (16:52 +0000)]
Merge "Enabled area info update for India"
Calin Juravle [Fri, 4 May 2018 02:51:18 +0000 (19:51 -0700)]
Make system server profiling an explicit runtime intent
Pass an explicit flag to the runtime when we need to profile the system
server. This ensures that we only start the ProfileSaver and allocate the
code cache when needed.
Test: manual, on a device with system server profiling enabled
Bug:
74081010
Change-Id: I5647e0bfb47d31c0e39bb3f59650cc956f49c4db
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)
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)
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 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
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 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 15:31:27 +0000 (15:31 +0000)]
Merge "frameworks/base: Update a few more references to android.jar."
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 [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 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
Chenbo Feng [Tue, 1 May 2018 20:51:13 +0000 (13:51 -0700)]
Remove the unused file parsing function
With the new xt_bpf support for iface stats. We no longer need to parse
the per interface stats from /proc/net/dev. And since the old xt_qtaguid
code path also not depend on it, we can completly remove that helper
function since no caller is depending on it now.
Bug:
72111305
Test: runtest frameworks-net -c com.android.internal.net.NetworkStatsFactoryTest
Change-Id: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
Chenbo Feng [Wed, 18 Apr 2018 22:44:46 +0000 (15:44 -0700)]
Use eBPF map data for per iface stats
After adding the xt_bpf module and ifaceStatsMap, eBPF tool can now
support reading per interface data. So networkStatsFactory should move
away from parsing proc/net/dev and use the eBPF map stats instead.
Bug:
72111305
Test: atest com.android.server.net.NetworkStatsServiceTest
Change-Id: Ibcc6150d00835b3bd33af22a72e4a86e172581cf
Andreas Gampe [Tue, 1 May 2018 19:10:54 +0000 (12:10 -0700)]
Framework: Restrict warning message
Only print the message of the cache wasn't pruned.
Bug:
26978865
Test: manual
Change-Id: I564ecddf6c8fafcc9699ec6bfbd622214edf79c8
Anton Hansson [Tue, 1 May 2018 17:32:50 +0000 (18:32 +0100)]
frameworks/base: Update a few more references to android.jar.
These files are moving. Update the paths so that the old files can be
deleted.
Bug:
77525052
Test: ./build for one of these scripts
Change-Id: Iacca1f1930d6a2614866f6503a2b4c1eba4d4018
Chalard Jean [Tue, 1 May 2018 03:07:35 +0000 (03:07 +0000)]
Merge "Let DnsManager fill in LinkProperties for private DNSes"
android-build-prod (mdb) [Tue, 1 May 2018 01:31:31 +0000 (01:31 +0000)]
Merge changes Ie4709b6e,I57980ccb
* changes:
com.android.nfc_extras is built with java_sdk_library
Fix link-type check warning on com.android.nfc_extras
android-build-prod (mdb) [Mon, 30 Apr 2018 20:37:46 +0000 (20:37 +0000)]
Merge "Get/Set IO capability of Bluetooth device"
Stanley Tng [Mon, 30 Apr 2018 19:48:36 +0000 (19:48 +0000)]
Merge "Disable Hearing Aid Profile for all platforms except Pixels"
Ajay Panicker [Mon, 30 Apr 2018 18:06:15 +0000 (18:06 +0000)]
Merge "Don't set Bluetooth volume when the Bluetooth stream changes"
Stanley Tng [Wed, 25 Apr 2018 16:13:08 +0000 (09:13 -0700)]
Disable Hearing Aid Profile for all platforms except Pixels
Add code to selectively disable Hearing Aid Profile depending on the
config.xml file.
Note: Cherry-picked from internal branch.
Bug:
78142728
Test: Manual Pairing on various Pixel phones
Change-Id: I8094f1a1665647b026eb9601e032fb7fbb816ec6
(cherry picked from commit
a21efa58369b304e5ea818a3f8b1577f1fed3d02)
Pulkit Bhuwalka [Wed, 28 Mar 2018 20:51:43 +0000 (13:51 -0700)]
Get/Set IO capability of Bluetooth device
Creates the hidden BluetoothAdapter APIs which can be used to
control IO capability settings on the local Bluetooth device.
Bug:
36015413
Test: Used a test activity to control getting/setting the value and
attempting pairing.
Change-Id: Ibbfdc5ae5a1d56c6e3d003ab3bf5d095dcb583e4
(cherry picked from commit
6043b7b90a27a836241bfc05e71eb46ce04c66cf)
Shuo Qian [Fri, 27 Apr 2018 18:39:20 +0000 (18:39 +0000)]
Merge "Restore the OEM hook implementation and usage"
Ajay Panicker [Fri, 27 Apr 2018 14:13:23 +0000 (07:13 -0700)]
Don't set Bluetooth volume when the Bluetooth stream changes
Don't restore the remembered volume whenever an Bluetooth A2DP stream
comes up or whenever Bluetooth AVRCP reports absolute volume support.
All Bluetooth volume memory will now be handled by Bluetooth.
Bug:
30602783
Test: See that AudioService doesn't try to change the volume when a
Bluetooth device connects.
Change-Id: I683062c1a0565591ae33cbbb0381730b86ad17c2
Jiyong Park [Wed, 25 Apr 2018 11:05:48 +0000 (20:05 +0900)]
com.android.nfc_extras is built with java_sdk_library
Remove the biolerplate code using java_sdk_library module type.
Bug:
77575606
Test: m -j
Change-Id: Ie4709b6ebc18bc2e4e26137d4a097d734f4435fe
android-build-prod (mdb) [Fri, 27 Apr 2018 04:53:52 +0000 (04:53 +0000)]
Merge "Add the list of private DNS addresses to LinkProperties"
Chalard Jean [Wed, 11 Apr 2018 09:58:52 +0000 (18:58 +0900)]
Let DnsManager fill in LinkProperties for private DNSes
(clean cherry-pick from ag/
3880157)
Test: new tests pass
Bug:
73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610
Merged-In: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811
Merged-In: I72ecaa4f7d7320ffa2e0ba82fadafc947c8a6981
Chalard Jean [Wed, 11 Apr 2018 07:36:41 +0000 (16:36 +0900)]
Add the list of private DNS addresses to LinkProperties
(clean cherry-pick from ag/
3874803)
Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug:
73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
Merged-In: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
Merged-In: I6bdbef78d078d68534c8e07e9af031ce374560ef
Jiyong Park [Thu, 22 Feb 2018 07:04:02 +0000 (16:04 +0900)]
Fix link-type check warning on com.android.nfc_extras
The library has been built without SDK, and is used by an app
NfcExtrasTests that is built with SDK. Such this SDK -> non-SDK
dependency has been causing link-type check warnings, which will turn
into errors soon.
This change fixes the warning by making a stub library
com.android.nfc_extras.stubs from the runtime library and let the app to
link against the stub library. Since the stubs library does not use any
private APIs, it is built with SDK.
Bug:
69899800
Test: m -j NfcExtrasTests is successful and does not show any link-type
check warning.
Merged-In: I57980ccbc9036d7cc6df114a975a384d10a2962b
Change-Id: I57980ccbc9036d7cc6df114a975a384d10a2962b
(cherry picked from commit
ded4fd729b50d5298e77199194996d22d3b573cf)
Shuo Qian [Fri, 27 Apr 2018 01:27:02 +0000 (01:27 +0000)]
Restore the OEM hook implementation and usage
The current plan is to keep the OEM hook implementation in the framework
, this is for legacy device and old device upgrading (per b/
78098059).
For P launching device, the OEM hook service is removed in hal, so the
OEM hook api in framework should return something dummy, and prevent
infinite loop to get service, but these parts should be done in seperate
CLs after this restore CL is merged.
This reverts commit
f09bde2809b4eb34fb68d0935f8b963fb6a9fcde.
Bug:
34344851
Change-Id: I2aea9be9aa7cecd4f7a1f1783391f0af173bfc59
Test: pass Treehugger tests; pass cuttlefish test RilE2eTests
Merged-In: I1f2117331a7f846b192c5f956f3841d58cb8154b