OSDN Git Service
Josh Hou [Mon, 11 Mar 2019 15:59:34 +0000 (23:59 +0800)]
add NonNull annotation to API
Bug:
126702863
Test: Build pass
Change-Id: I3398d43837bef90ebe685d7f7c35c6c5d0defd7e
Josh Hou [Mon, 4 Mar 2019 11:19:50 +0000 (19:19 +0800)]
add NonNull annotation to API
Bug:
126700962
Test: Build pass
Change-Id: I50d8924b6f3323016cd68faa4769e608701b2134
Treehugger Robot [Fri, 22 Feb 2019 02:30:51 +0000 (02:30 +0000)]
Merge "Convert Android.mk file to Android.bp"
Sudheer Shanka [Fri, 22 Feb 2019 01:24:03 +0000 (01:24 +0000)]
Merge "Fix potential crash when per-procstate cpu times tracking is turned on."
Michele Berionne [Fri, 22 Feb 2019 01:18:41 +0000 (01:18 +0000)]
Merge "Add checks on multisim capabilities."
Sooraj Sasindran [Fri, 22 Feb 2019 00:41:29 +0000 (00:41 +0000)]
Merge "Allow UiAutomation to adopt the shell permission indentity"
Sasha Smundak [Tue, 12 Feb 2019 17:38:16 +0000 (09:38 -0800)]
Convert Android.mk file to Android.bp
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: I23d8d5a019155a0f3296f7ab75e9b44b7621f3c8
Merged-In: I23d8d5a019155a0f3296f7ab75e9b44b7621f3c8
Tor Norbye [Thu, 21 Feb 2019 22:39:49 +0000 (22:39 +0000)]
Merge "Update MbmsDownloadServiceBase to reflect implements IInterface"
Remi NGUYEN VAN [Thu, 21 Feb 2019 22:13:31 +0000 (22:13 +0000)]
Merge "Add logging to NetworkStackClient"
Michele [Mon, 4 Feb 2019 19:29:10 +0000 (11:29 -0800)]
Add checks on multisim capabilities.
Rename method isMultisimCarrierRestricted to isMultisimSupported to
indicate extended scope that includes checks on the capabilities of the
hardware to support multi-SIM configuration.
Bug:
123537730
Test: Compilation, test application
Change-Id: I20860c7a25b054b8312c144544726337e09559e2
Merged-In: I20860c7a25b054b8312c144544726337e09559e2
Treehugger Robot [Thu, 21 Feb 2019 20:27:58 +0000 (20:27 +0000)]
Merge "Send special permission information to netd"
Treehugger Robot [Thu, 21 Feb 2019 20:27:53 +0000 (20:27 +0000)]
Merge "Use toArray(T[]) instead of toArray()."
Svet Ganov [Mon, 25 Jun 2018 23:39:23 +0000 (16:39 -0700)]
Allow UiAutomation to adopt the shell permission indentity
For testing we often need to run shell commands. This can be done
today via running a shell command from an instrumentation test
started from the shell. However, this requires adding shell commands
which are not in the API contract, involve boilerplate code, require
string parsing, etc.
This change allows an instrumentation started from the shell to
adopt the shell UID permission state. As a result one can call APIs
protected by permissions normal apps cannot get by are granted to
the shell. This enables adding dedicated test APIs protected by
signatures permissions granted to the shell.
Test: cts-tradefed run cts-dev -m CtsUiAutomationTestCases
-t android.app.uiautomation.cts.UiAutomationTest#testAdoptShellPermissions
bug:
80415658
Merged-In: I4bfd4b475225125512abf80ea98cd8fcacb6a1be
Change-Id: I4bfd4b475225125512abf80ea98cd8fcacb6a1be
vichang [Thu, 21 Feb 2019 18:42:06 +0000 (18:42 +0000)]
Merge "Revert "Revert "Delay start of bootanimation until after the Runtime APEX is mounted."""
Treehugger Robot [Thu, 21 Feb 2019 17:32:25 +0000 (17:32 +0000)]
Merge "Add feature flag for Dynamic Android"
Nicolas Geoffray [Thu, 21 Feb 2019 17:24:00 +0000 (17:24 +0000)]
Merge "Pick up the apexBootImage pinner service files when the boot image is apex.art."
vichang [Thu, 21 Feb 2019 12:54:50 +0000 (12:54 +0000)]
Revert "Revert "Delay start of bootanimation until after the Runtime APEX is mounted.""
This reverts commit
706bf3f6282644d0d536b88a1156fbf6c49d71d3.
Reason for revert: b/
124939955. bootanimation depends on libandroidicu in the Runtime APEX.
Bug:
124939955
Change-Id: I2b5a9d74a5f0ae11978ff4b0850dd7e4becb9b88
Remi NGUYEN VAN [Thu, 21 Feb 2019 14:21:19 +0000 (14:21 +0000)]
Merge "Change getPackageUid to getPackageUidAsUser"
Paul Duffin [Thu, 21 Feb 2019 13:22:15 +0000 (13:22 +0000)]
Merge "Update backwards compatibility support for android.test.base"
Paul Duffin [Thu, 21 Feb 2019 13:21:54 +0000 (13:21 +0000)]
Merge "Allow framework-atb-backward-compatibility to be added to bootclasspath"
Chiachang Wang [Thu, 21 Feb 2019 11:45:10 +0000 (11:45 +0000)]
Merge "Fix build warnings for CaptivePortalLogin"
Paul Duffin [Wed, 16 May 2018 12:06:33 +0000 (13:06 +0100)]
Update backwards compatibility support for android.test.base
Previously, the plan was for android.test.base to be removed from the
bootclasspath in P, i.e. in the same release as org.apache.http.legacy.
Any apps that targeted < P were to have the android.test.base library
added to their app classpath in order to maintain backwards
compatibility.
Unfortunately, it was not possible to remove android.test.base from P
and instead it is being removed from Q. This update prepares for that
by updating the backwards compatibility support and its tests to add
the android.test.base library to apps that target < Q.
The affected code is only used at runtime when
REMOVE_ATB_FROM_BCP=true.
Bug:
73711752
Test: atest FrameworksCoreTests with and without REMOVE_ATB_FROM_BCP=true
Change-Id: I76b40dad14193cd174114a351b1350c18d647bed
Paul Duffin [Fri, 15 Feb 2019 11:39:12 +0000 (11:39 +0000)]
Allow framework-atb-backward-compatibility to be added to bootclasspath
Fixes a build failure that occurs when it is executed with
REMOVE_ATB_FROM_BCP=true.
Setting REMOVE_ATB_FROM_BCP=true adds the
framework-atb-backward-compatibility target to the PRODUCT_BOOT_JARS
path in place of android.test.base. That causes a problem because the
build expects that everything on the PRODUCT_BOOT_JARS is installable.
Bug:
73711752
Test: make droid and flash both with and without REMOVE_ATB_FROM_BCP=true
Change-Id: I6595ff8dba42e6b85abbf6a6cad4d8970b5a91a0
Remi NGUYEN VAN [Mon, 18 Feb 2019 02:20:28 +0000 (11:20 +0900)]
Add logging to NetworkStackClient
The current logging relies on the system log that may rotate. This is a
problem to investigate bugs where the network stack service is not
started. Add a SharedLog to NetworkStackClient and dump it in
ConnectivityService (for lack of a better place to dump it).
Bug:
124307802
Test: Booted, dumpsys connectivity shows the log
Change-Id: If596451d0613645f68a8a32acb032eea76ea506c
Remi NGUYEN VAN [Thu, 21 Feb 2019 08:07:57 +0000 (17:07 +0900)]
Change getPackageUid to getPackageUidAsUser
The wrong overload of PackageManager is being called, setting
USER_SYSTEM as flag instead of the user to resolve the network stack
UID.
Test: phone boots, WiFi works, additional tests in child CLs
Change-Id: I89b11b38c390d0e77a5917c74daccccd74c2d0a3
Howard Chen [Mon, 18 Feb 2019 05:37:48 +0000 (13:37 +0800)]
Add feature flag for Dynamic Android
Bug:
119647479
Test: flashall and check the option exists.
Merged-In: I46efd27a6880dde4bc69aa457a6f3b0fdd9ce5cd
Change-Id: I46efd27a6880dde4bc69aa457a6f3b0fdd9ce5cd
Chiachang Wang [Thu, 21 Feb 2019 06:00:59 +0000 (14:00 +0800)]
Fix build warnings for CaptivePortalLogin
CaptivePortalLogin needs only the defintion in
metrics_constants.proto. This will not need the jarjar_rules.
Thus, remove the unnecessary rule to fix the build warning.
Test: make CaptivePortalLogin and no warning
Bug:
123717273
Change-Id: I5bb3ee61be769989d02a2762a7747d4dafd7bd71
Tor Norbye [Thu, 21 Feb 2019 03:25:15 +0000 (19:25 -0800)]
Update MbmsDownloadServiceBase to reflect implements IInterface
The interface is there in the stubs but was missing from the signature
file; this was added as a special case to be compatible with doclava
but the special case should have been removed when we switched to the
new signature file format.
This makes this signature match the other signature for
MbmsStreamingServiceBase:
public class MbmsDownloadServiceBase extends android.os.Binder implements android.os.IInterface {
public class MbmsStreamingServiceBase extends android.os.Binder implements android.os.IInterface {
Test: make update-api checkapi
Change-Id: I847066580248f47be609e2795db8904f58e550b8
Kiyoung Kim [Thu, 21 Feb 2019 00:16:45 +0000 (00:16 +0000)]
Merge "Schematize Crypto system properties"
Christian Wailes [Wed, 20 Feb 2019 22:53:45 +0000 (22:53 +0000)]
Merge "Updated Zygote IPC related comments."
Treehugger Robot [Wed, 20 Feb 2019 22:07:36 +0000 (22:07 +0000)]
Merge "Add documentation for inserting RCS 1-on-1 thread"
Chenbo Feng [Tue, 8 Jan 2019 00:14:26 +0000 (16:14 -0800)]
Send special permission information to netd
Netd need the list of apps that have permission INTERNET or permission
UPDATE_DEVICE_STATS at run time to make decisions about application
request. To avoid protential deadlock and reduce the traffic between
netd and system server, Use packageManagerServcie to send the list of
apps that have those permissions to netd when device boot and when new
apps get installed.
Bug:
111560570
Bug:
111560739
Test: install and uninstall packages and dumpsys netd trafficcontroller
Change-Id: Idb9905f424557a5c59e35d41f5eafe345aca87e0
Garfield Tan [Sat, 13 Oct 2018 00:45:50 +0000 (17:45 -0700)]
Use toArray(T[]) instead of toArray().
toArray() always creates Object array, which can't be cast to array type
of specific types.
Bug: None
Test: Package can be installed and uninstalled correctly with a package
list.
Change-Id: I9d6c8c2b1c3de767b87643f4c3aaff1044e33fbc
Merged-In: I9d6c8c2b1c3de767b87643f4c3aaff1044e33fbc
Treehugger Robot [Wed, 20 Feb 2019 21:08:21 +0000 (21:08 +0000)]
Merge "Convert Android.mk file to Android.bp"
Nathan Harold [Wed, 20 Feb 2019 21:08:05 +0000 (21:08 +0000)]
Merge "Debug Event for Malformed PLMN ID in CellIdentity"
Nathan Harold [Wed, 13 Feb 2019 00:13:34 +0000 (16:13 -0800)]
Debug Event for Malformed PLMN ID in CellIdentity
Add a debug event to catch the case where the modem
reports a PLMN-ID that is either malformed or incomplete.
Bug:
124332651
Test: compilation
Change-Id: Iffea47349ff999aade2aa26e30f00e5007ba7b4e
Treehugger Robot [Wed, 20 Feb 2019 20:01:14 +0000 (20:01 +0000)]
Merge "Split RCS events into API and internal classes"
Chris Wailes [Wed, 20 Feb 2019 19:19:48 +0000 (11:19 -0800)]
Updated Zygote IPC related comments.
Bug:
124637285
Test: None; comment only changes
Change-Id: Ie567715a1ee08cdf65e3135aa75e3bd95ef5ab0d
Sasha Smundak [Fri, 8 Feb 2019 23:13:25 +0000 (15:13 -0800)]
Convert Android.mk file to Android.bp
See build/soong/README.md for more information.
Bug:
122332340
Test: treehugger
Change-Id: I4ccc0a2e13fc49a0109e9823fbcb4077e11455d5
Merged-In: I4ccc0a2e13fc49a0109e9823fbcb4077e11455d5
Nicolas Geoffray [Wed, 20 Feb 2019 15:41:03 +0000 (15:41 +0000)]
Pick up the apexBootImage pinner service files when the boot image is apex.art.
Test: adb shell dumpsys pinner
Bug:
119800099
Change-Id: I780b65dfba0fc8f7a2807f29fa3a0f7984ae7023
Nathan Harold [Wed, 20 Feb 2019 17:50:41 +0000 (17:50 +0000)]
Merge "Expose the Radio HAL Version for Test Purposes"
Xin Li [Wed, 20 Feb 2019 16:25:58 +0000 (16:25 +0000)]
Merge changes from topic "PPRL.190205.001"
* changes:
Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
DO NOT MERGE - Merge PPRL.190205.001 into master
Leland Miller [Wed, 20 Feb 2019 15:53:49 +0000 (07:53 -0800)]
Add documentation for inserting RCS 1-on-1 thread
Test: None, documentation only
Bug:
124781386
Change-Id: I1ab521aa6ceb54dc513a219b238f66a59fbfab97
Andrei-Valentin Onea [Wed, 20 Feb 2019 14:49:10 +0000 (14:49 +0000)]
Merge "Use sampled value in hidden api logger"
Andrei Onea [Fri, 15 Feb 2019 13:50:47 +0000 (13:50 +0000)]
Use sampled value in hidden api logger
The hidden api logger interface also receives the actual sampled value.
This is an intermediate step before a new logging method is added.
Test: m
Bug:
119217680
(cherry picked from commit
31bde163932dab75a8301e43b2adcb684f0470ec)
Change-Id: I3345bdcdf57e1f60970c85572e503d7b33af7148
Merged-In: I707a2624a254a80391cdae277dd59daa503d055f
Adrian Roos [Wed, 20 Feb 2019 12:50:28 +0000 (12:50 +0000)]
Merge "Fix potential memory leak in SomeArgs"
Treehugger Robot [Wed, 20 Feb 2019 12:00:15 +0000 (12:00 +0000)]
Merge "Skip unreachable route when estimating VPN destinations"
Treehugger Robot [Wed, 20 Feb 2019 11:14:24 +0000 (11:14 +0000)]
Merge "Consider 200 response with "Content-length <= 4" to not be a captive portal."
Bin Chen [Wed, 20 Feb 2019 09:34:04 +0000 (17:34 +0800)]
Fix potential memory leak in SomeArgs
When recycling SomeArgs in pool, some fields are not set to null.
Which result potential memory leak as SomeArgs in pool still holds
the reference object.
To fix this issue, clear all args when recycling.
Change-Id: Ie730c3889da948c60ef746ddbe2e926d94ad7e06
Signed-off-by: Bin Chen <bin0515@gmail.com>
Signed-off-by: Wei Huang <hwbest.v@gmail.com>
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 05:25:00 +0000 (05:25 +0000)]
Merge "Adding validate before switch feature."
Tyler Gunn [Wed, 20 Feb 2019 04:40:13 +0000 (04:40 +0000)]
Merge "Add support for Telecom logging to obfuscate string phone numbers."
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 02:58:09 +0000 (02:58 +0000)]
Merge "Move getPhoneCount implementation back to TelephonyManager."
Malcolm Chen [Fri, 25 Jan 2019 00:33:51 +0000 (16:33 -0800)]
Adding validate before switch feature.
In CBRS DSDS mode, switching data to CBRS network will require
validation first. Adding a component of CellularNetworkValidator
to trigger the validation and pass the result back to PhoneSwitcher.
Bug:
118348832
Test: manual
Change-Id: I689aa494f031834b5cee76906922ebdafa9c77ed
Merged-In: I689aa494f031834b5cee76906922ebdafa9c77ed
Hall Liu [Wed, 20 Feb 2019 01:08:04 +0000 (01:08 +0000)]
Merge "Turn on enforcing mode for Q-based location APIs"
Shuo Qian [Wed, 20 Feb 2019 01:08:03 +0000 (01:08 +0000)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"
Malcolm Chen [Thu, 31 Jan 2019 05:19:57 +0000 (21:19 -0800)]
Move getPhoneCount implementation back to TelephonyManager.
Moving it inside iTelephony creates problems. Some components call
getPhoneCount during initialization while iTelephony service is not
even running, which will cause phone process to crash.
Bug:
123667461
Test: manual
Change-Id: I51199eaf0bd87055c21fe61af50f4c353137d621
Merged-In: I51199eaf0bd87055c21fe61af50f4c353137d621
sqian [Thu, 14 Feb 2019 22:58:03 +0000 (14:58 -0800)]
Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel
Test: Treehugger
Bug:
123999640
Change-Id: Ie68a02a7e0f9aabe5dbc37806a495169feb63765
Merged-In: Ie68a02a7e0f9aabe5dbc37806a495169feb63765
(cherry picked from commit
0c86fbf491f4781ef3be68ba51aa3bfdb0bd7bc0)
Treehugger Robot [Tue, 19 Feb 2019 22:21:05 +0000 (22:21 +0000)]
Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys"
Raman Tenneti [Wed, 6 Feb 2019 00:34:43 +0000 (16:34 -0800)]
Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
On 9/28 CL https://googleplex-android-review.git.corp.google.com/
5116913 was checked into pi-dev. Merge was bad(couple of lines were lost during merge).
https://b.corp.google.com/issues/
35655737#comment34
Adding LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS and LOCK_SCREEN_SHOW_NOTIFICATIONS to SETTINGS_TO_BACKUP array. This fixes apct/framework/presubmit test failure.
Bug:
35655737
Bug:
118674794
Test: presubmit unit tests
Change-Id: I2e9cc95e8827e72ef3c09910d4d3e089bde375e5
Merged-In: I421c7487955ee339f88e3957c973375d0f87e2ff
(cherry picked from commit
33a11bd0e3c29937af311bc55bbbe36ee63608f4)
Dmitry Dementyev [Tue, 19 Feb 2019 19:49:13 +0000 (19:49 +0000)]
Merge "Lazely initialize AccountManager debug table."
Leland Miller [Wed, 6 Feb 2019 18:07:38 +0000 (10:07 -0800)]
Split RCS events into API and internal classes
This will allow us to inject dependencies into the API classes that are
not parcelable or do not come from ircs.
Bug:
123699565
Test: Unit tests pass
Change-Id: Iab4e6ea3fd983eef7fb0cba7311175ea82a444ff
Treehugger Robot [Tue, 19 Feb 2019 18:18:40 +0000 (18:18 +0000)]
Merge "Convert Android.mk file to Android.bp"
Rubin Xu [Tue, 19 Feb 2019 16:56:47 +0000 (16:56 +0000)]
Skip unreachable route when estimating VPN destinations
Bug:
122652441
Test: atest com.android.server.connectivity.VpnTest
Test: Establish a IPv4 VPN with minimal routes and check
(dumpsys connectivity) the VPN network does not have INTERNET
capability.
Change-Id: Ic7f19ebb7b7f78a6ffb2a8ec3fc3eca5e5421f57
Dario Freni [Tue, 19 Feb 2019 15:43:35 +0000 (15:43 +0000)]
Merge "Add dariofreni to APEX-related files owners."
Nicolas Geoffray [Tue, 19 Feb 2019 14:28:18 +0000 (14:28 +0000)]
Merge "Add a dalvik.vm.boot-image option for zygote and installd."
Dario Freni [Mon, 18 Feb 2019 17:53:24 +0000 (17:53 +0000)]
Add dariofreni to APEX-related files owners.
Test: n/a
Change-Id: I3a26033f52d98e5edcde852fff007ba33ae90856
Adam Vartanian [Tue, 19 Feb 2019 09:27:35 +0000 (09:27 +0000)]
Merge "Fix authority parsing test"
Adam Vartanian [Mon, 18 Feb 2019 12:01:11 +0000 (12:01 +0000)]
Fix authority parsing test
The test has been failing because http://r.android.com/793302 changed
how the port separator was found, only scanning ASCII digits until it
hits a colon, and previously it would scan for the colon and then
percent-decode the rest of it. The new behavior actually better
matches the WHATWG URL parsing algorithm [1], which specifies that
ports only include ASCII digits. It does mean that some edge cases
that previously parsed as host "foo", port 42 will now parse as
host "foo:42", no port, but those URLs wouldn't be accepted by
browsers so they should be exceedingly rare.
The behavior per the WHATWG spec would be to fail to parse in the case
of a percent-encoded character in the port section, but this class is
specifically documented to accept garbage, so lumping the mis-encoded
port as part of the hostname (which will result in a hostname that's
invalid and impossible to resolve) seems like the best option.
[1] https://url.spec.whatwg.org/#port-state
Fixes:
124360078
Test: atest android.net.UriTest
Change-Id: I1c788cb7703c821ae74b542b74d89e10cba5a546
Treehugger Robot [Tue, 19 Feb 2019 02:02:35 +0000 (02:02 +0000)]
Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"
Xin Li [Mon, 18 Feb 2019 23:58:30 +0000 (15:58 -0800)]
DO NOT MERGE - Merge PPRL.190205.001 into master
Bug:
124234733
Change-Id: If654c6ab27cf6c376598e02cd3253e0b68ed5395
Treehugger Robot [Mon, 18 Feb 2019 19:11:00 +0000 (19:11 +0000)]
Merge "Force blacklist on VMRuntime.setTargetSdkVersion*()"
Jakub Gielzak [Mon, 18 Feb 2019 18:32:40 +0000 (10:32 -0800)]
Merge "Revert "Remove legacy-test and legacy-android-test targets""
am:
049c1589ee
Change-Id: Ia84907bfa038954256bc791490a490dd338b33ce
Jakub Gielzak [Mon, 18 Feb 2019 18:24:58 +0000 (18:24 +0000)]
Merge "Revert "Remove legacy-test and legacy-android-test targets""
Jakub Gielzak [Mon, 18 Feb 2019 18:24:17 +0000 (18:24 +0000)]
Revert "Remove legacy-test and legacy-android-test targets"
This reverts commit
3b0be60307cc6063795f8cd32356745ee371e757.
Reason for revert: Broken build
Change-Id: I71270c7b47163ab7147029f2d3961d1848fdd9eb
Anton Hansson [Mon, 18 Feb 2019 18:16:37 +0000 (10:16 -0800)]
Merge "Specify no resource_dirs for SystemUI"
am:
347d6ff9f9
Change-Id: I0b752a641e5f74d7dac1017616553f464427e219
Anton Hansson [Mon, 18 Feb 2019 18:03:36 +0000 (18:03 +0000)]
Merge "Specify no resource_dirs for SystemUI"
Paul Duffin [Mon, 18 Feb 2019 15:26:09 +0000 (07:26 -0800)]
Merge "Remove legacy-test and legacy-android-test targets"
am:
14daedf747
Change-Id: I67e3a6d58324affcb9119002d4fb2be23e3121fc
Paul Duffin [Mon, 18 Feb 2019 15:13:45 +0000 (15:13 +0000)]
Merge "Remove legacy-test and legacy-android-test targets"
Jin Seok Park [Mon, 18 Feb 2019 15:06:53 +0000 (07:06 -0800)]
Merge "Add OWNERS for ExifInterface"
am:
996d37ea59
Change-Id: I24669310bf259344675110b2e4463894843e776b
David Brazdil [Mon, 18 Feb 2019 14:59:20 +0000 (14:59 +0000)]
Force blacklist on VMRuntime.setTargetSdkVersion*()
The methods could be used to bypass the restrictions. Force them
onto the blacklist.
Test: builds
Change-Id: I77d1fb8ca7339bec5e933f87a3b672096e2e559e
Jin Seok Park [Mon, 18 Feb 2019 14:56:06 +0000 (14:56 +0000)]
Merge "Add OWNERS for ExifInterface"
Anton Hansson [Fri, 8 Feb 2019 09:01:32 +0000 (09:01 +0000)]
Specify no resource_dirs for SystemUI
The res directory is already included via the SystemUI-core
library. The default for resource_dirs is ["res"] if it exists,
so explicitly clear it to avoid depending on it twice.
Bug:
124035856
Test: m SystemUI
Change-Id: Ia1b06cd9eff4e614684efde34288cf9ebd895870
Xiao Ma [Mon, 18 Feb 2019 07:25:24 +0000 (23:25 -0800)]
Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest."
am:
e7e5a35b38
Change-Id: I555a4c49a92148a492172a4f2cec993428140cdc
Xiao Ma [Mon, 18 Feb 2019 07:12:04 +0000 (07:12 +0000)]
Merge "Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable in ApfTest."
Kiyoung Kim [Tue, 22 Jan 2019 01:18:05 +0000 (10:18 +0900)]
Schematize Crypto system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug:
117924132
Test: m -j
Change-Id: I141ae3a011f9cb3ea283ca25175205b6af966ec6
Merged-In: I141ae3a011f9cb3ea283ca25175205b6af966ec6
Jin Seok Park [Mon, 11 Feb 2019 08:27:09 +0000 (17:27 +0900)]
Add OWNERS for ExifInterface
Adding specific owners for ExifInterface in order to make sure
AndroidX code is changed when framework code is changed.
Bug:
122276930
Test: N/A
Change-Id: Icf0d74ad915d4b322a70c74762753411ad96bbb1
Remi NGUYEN VAN [Mon, 18 Feb 2019 01:15:47 +0000 (17:15 -0800)]
Merge "Rename NetworkStack package"
am:
e4a40c77e1
Change-Id: I0acdbd8716b67241367c78b7c190b72086e2db4d
Remi NGUYEN VAN [Mon, 18 Feb 2019 01:07:51 +0000 (01:07 +0000)]
Merge "Rename NetworkStack package"
Ryan Mitchell [Sat, 16 Feb 2019 02:50:21 +0000 (18:50 -0800)]
Merge "Check intent action in OMS.PackageReceiver for secure coding"
am:
e705e26703
Change-Id: Ic73dbe9bf5fe1f5b711ee24adbc72c1b066a63a4
Ryan Mitchell [Sat, 16 Feb 2019 02:36:41 +0000 (02:36 +0000)]
Merge "Check intent action in OMS.PackageReceiver for secure coding"
Sudheer Shanka [Tue, 17 Jul 2018 01:00:46 +0000 (18:00 -0700)]
Fix potential crash when per-procstate cpu times tracking is turned on.
When per-procstate cpu times tracking is turned on,
BatteryStatsImpl tries to access mKernelSingleUidTimeReader but
it's possible that mKernelSingleUidTimeReader hasn't been initialized
yet after a reboot and this could lead to a system_server crash.
Bug:
111523951
Test: manual
Change-Id: Id014f23fbe31fed64fba769f14ba4396a003092e
Merged-In: Id014f23fbe31fed64fba769f14ba4396a003092e
(cherry picked from commit
020239df85931c3d5d5a89259f2e321fa48de353)
Stanley Tng [Sat, 16 Feb 2019 02:04:29 +0000 (18:04 -0800)]
[automerger skipped] Merge "Fix the bad link due to typo"
am:
c0c27fbf49 -s ours
am skip reason: change_id Ia06e1fffd814671289a1caebd5962aedc18a28d7 with SHA1
a44f2c075b is in history
Change-Id: Ib00807a7f22c339551aa750459b4a7c0398618e4
Treehugger Robot [Sat, 16 Feb 2019 01:56:30 +0000 (01:56 +0000)]
Merge "Fix the bad link due to typo"
Remi NGUYEN VAN [Sat, 16 Feb 2019 01:56:22 +0000 (17:56 -0800)]
Merge "Sign networkstack with its own certificate"
am:
fd2d7dc685
Change-Id: I24ddb16d7a163ad6141b4f6c46e5dda9f249a906
Remi NGUYEN VAN [Sat, 16 Feb 2019 01:48:49 +0000 (01:48 +0000)]
Merge "Sign networkstack with its own certificate"
Hall Liu [Thu, 14 Feb 2019 01:01:03 +0000 (17:01 -0800)]
Turn on enforcing mode for Q-based location APIs
Also fix some logging.
Bug:
116258458
Test: manual, unit
Change-Id: I370aae906760365d9cd2a35b456d8ff8522c0902
TreeHugger Robot [Sat, 16 Feb 2019 00:53:47 +0000 (00:53 +0000)]
Merge "Fix the incorrect javadoc links" into stage-aosp-master
Remi NGUYEN VAN [Sat, 16 Feb 2019 00:38:52 +0000 (16:38 -0800)]
Merge "Fix framework and NetworkStack classes conflicts"
am:
3f23efdd13
Change-Id: I8c207040c42a3d02b8383e13a4f839c250788f58
Elliott Hughes [Sat, 16 Feb 2019 00:26:01 +0000 (16:26 -0800)]
Merge "zygote: use async signal safe log to record child process death"
am:
2555ed5bca
Change-Id: I9734da9897528cfc3b6c4b45d56eb6454ec435c8
Remi NGUYEN VAN [Sat, 16 Feb 2019 00:22:29 +0000 (00:22 +0000)]
Merge "Fix framework and NetworkStack classes conflicts"