OSDN Git Service
Calin Juravle [Fri, 14 Jul 2017 23:40:07 +0000 (16:40 -0700)]
Fix splits class loader context for non dependant splits
If the app doesn't request for splits to be loaded in isolation or does
not declare inter-split dependencies, then all the splits are loaded in
the base apk class loader (in the order of they are defined).
Fix the class loader context passed to dex2oat to reflect the runtime
loading logic.
(cherry picked from commit
305aeea38f96f0b94ad4be5cb979dd9cf98cf7df)
Bug:
38138251
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
Merged-In: Ia0623d38883ae244fd16c0afb053fef016bf260a
Change-Id: Ia0623d38883ae244fd16c0afb053fef016bf260a
Calin Juravle [Thu, 13 Jul 2017 01:52:49 +0000 (18:52 -0700)]
Encode the entire class loader context for dex2oat
Until now the split dependencies were passed as a flatten list to dex2oat.
In the presence of DelegateLastClassLoaders this is no longer enough to
ensure the correctness of the compilation.
This CL encodes the split dependencies together with their declared class
loader in a format accepted by dex2oat.
(partially cherry picked from commit
19da1cf72e8c448743a8c27ac6d73424ae42c7ec)
Bug:
38138251
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
Merged-In: Iaabd5d8bd5e6d027a8de5a408777fd517063d9f1
Change-Id: Iaabd5d8bd5e6d027a8de5a408777fd517063d9f1
Calin Juravle [Mon, 17 Jul 2017 22:23:21 +0000 (15:23 -0700)]
Add a command line option to optimize individual splits
The new option is "--split SplitName" and applies to "adb shell cmd
package compile" command.
Usage example:
adb shell cmd package compile -m speed --split split_feature_a.apk
com.android.cts.classloadersplitapp
(cherry picked from commit
b6f844d28cc7a7bf2b477a904263fcbe9b26d2c4)
Bug:
38138251
Test: adb install-multiple CtsClassloaderSplitApp.apk
CtsClassloaderSplitAppFeatureA.apk CtsClassloaderSplitAppFeatureB.apk
adb shell cmd package compile -m speed --split split_feature_a.apk
com.android.cts.classloadersplitapp
check the status of split_feature_a
runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptOptionsTests.java
Merged-In: I579bb12fa6699f99cd3824f185bd9352fb8007c5
Change-Id: I579bb12fa6699f99cd3824f185bd9352fb8007c5
Calin Juravle [Mon, 17 Jul 2017 22:12:01 +0000 (15:12 -0700)]
Refactor the arguments passed to dexopt invocations
Wrap the arguments passed to the various performDexopt calls into the
DexoptOptions object.
This will make adding extra arguments (like compile only a split) much
easier and avoid extending quite a few internal methods.
(cherry picked from commit
1d0e83d2cee794ba576d573119e826905a4422cd)
Bug:
38138251
Test: adb shell cmd package compile ....
adb shell cmd package bg-dexopt-job ...
install new apps and check that they compiled
runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptOptionsTests.java
Merged-In: Ia9930edd2dceb7535d6168eceb8e3199c82b6306
Change-Id: Ia9930edd2dceb7535d6168eceb8e3199c82b6306
Shubham Ajmera [Thu, 25 May 2017 00:46:36 +0000 (17:46 -0700)]
Reduce app size by downgrading inactive apps
This will trigger when the device will have low space.
Active apps here refer to the apps which were either active
in foregrond or in background and also used by other packages.
Apps which are inactive for X days downgraded to verify. X is
determined by sysprop pm.dexopt.unopt_after_inactive_days
If the system properties are not set, no effect will take place.
The above operations will take place in background dexopt service.
If user uses the app again, it will again be speed-compiled when
background dexopt service starts next time.
(cherry picked from commit
246dccf9327631597767afe418ce43ae6d07d102)
Bug:
36598475
Test: manual
* Remove the check in the code that allows downgrade only when
the space is low on the device.
* adb root
* Set pm.dexopt_unopt_after_inactive_days to 600
* Make sure the current time of the device is correctly set
* Install 2 non system apps - B, C
* Downgrade B to extract
* Upgrade a system apps to speed-profile - E
* Downgrade a system app to quicken - G
* adb shell cmd package bg-dexopt-job
Expected Results:
* Extract - B
* Verify - C
* There should not be any entries for apps E an G
in dalvik_cache
Merged-In: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Change-Id: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Treehugger Robot [Tue, 31 Oct 2017 21:48:30 +0000 (21:48 +0000)]
Merge changes I2ef3737f,If080281f
* changes:
Add property for system server compiler filter
Compile secondary dex at boot after OTA
Treehugger Robot [Tue, 31 Oct 2017 21:47:19 +0000 (21:47 +0000)]
Merge "Change storage migration to use quota APIs."
Treehugger Robot [Tue, 31 Oct 2017 21:15:31 +0000 (21:15 +0000)]
Merge "Reland "HIDL Java getService now the same as C++.""
Steven Moreland [Wed, 25 Oct 2017 04:50:46 +0000 (04:50 +0000)]
Reland "HIDL Java getService now the same as C++."
Add getService(retry) for Java for C++ feature parity.
Test: hidl_test_java, boot
Bug:
67981006
Change-Id: I4e6711f8c2d7ad0ef6994ce9c480118320e1bde8
Mathieu Chartier [Fri, 16 Jun 2017 02:09:38 +0000 (19:09 -0700)]
Add property for system server compiler filter
The property is dalvik.vm.systemservercompilerfilter, this changes
if dexopt is needed.
(cherry picked from commit
5e07a0d9cacb1bf943f4617b1edcb930e1578dad)
Bug:
62356545
Test: adb shell setprop dalvik.vm.systemservercompilerfilter quicken
Test: adb shell stop && adb shell start
Merged-In: I2ef3737f24816a4cb75e718abf274a891eb9fda1
Change-Id: I2ef3737f24816a4cb75e718abf274a891eb9fda1
Shubham Ajmera [Fri, 9 Jun 2017 22:40:58 +0000 (15:40 -0700)]
Compile secondary dex at boot after OTA
(cherry picked from commit
ce54397368dc98182d7b4eb2ff3c142bbd87e39d)
Bug:
38413085
Test: build successful
Merged-In: If080281fb3147fea625bcafce91167e8c1439736
Change-Id: If080281fb3147fea625bcafce91167e8c1439736
Jeff Sharkey [Thu, 6 Jul 2017 17:29:06 +0000 (11:29 -0600)]
Change storage migration to use quota APIs.
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.
(cherry picked from commit
c8b29ac6f0340bd0c3c9eb388c4be2d446de9a59)
Bug:
36056324
Test: builds, boots
Merged-In: Ibdf1ee4e8885680e106df6a9269b6309ddc61af8
Change-Id: Ibdf1ee4e8885680e106df6a9269b6309ddc61af8
Treehugger Robot [Tue, 31 Oct 2017 15:24:11 +0000 (15:24 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
Treehugger Robot [Tue, 31 Oct 2017 13:26:23 +0000 (13:26 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
Treehugger Robot [Tue, 31 Oct 2017 02:25:31 +0000 (02:25 +0000)]
Merge "Fix Robolectric Bluetooth tests"
Hansong Zhang [Mon, 30 Oct 2017 23:38:16 +0000 (16:38 -0700)]
Fix Robolectric Bluetooth tests
The Bluetooth HID profile name BluetoothInputDevice is recently changed
to BluetoothHidHost, but it is not updated in the SDK for Robolectric
tests, and it causes problems with SettingsLib tests. Thus, we need to
replace the HID profile use case with PAN. This change will not
influence the test coverage.
Test: make RunSettingsLibRoboTests
Bug:
68213274
Change-Id: If30ef0e82252d8f7229815b80e403ae63ab10643
Tobias Thierer [Mon, 30 Oct 2017 17:52:00 +0000 (17:52 +0000)]
OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com
He prefers to use his @android.com account.
Test: Treehugger
Bug:
63673347
Exempt-From-Owner-Approval: Allow @android.com to approve this CL :)
Change-Id: Ie80cc7864de7b91ae44ad57f0bae9b859d034803
Tobias Thierer [Mon, 30 Oct 2017 17:40:36 +0000 (17:40 +0000)]
Merge "Track moving of OkHttp facade API to new package."
Tobias Thierer [Tue, 24 Oct 2017 23:58:29 +0000 (00:58 +0100)]
Track moving of OkHttp facade API to new package.
Another CL in this topic moves the classes from
libcore.net.http
to
com.squareup.okhttp.internalandroidapi.
In jarjar'ed build targets, this becomes
com.android.okhttp.internalandroidapi.
This facade constitutes the API via which non-libcore parts
of the Android platform (currently framework) may access
OkHttp. It's moving because libcore.net.http is already
part of libcore, and the overlap of packages is problematic
for builds with EXPERIMENTAL_USE_OPENJDK9 set to true.
Bug:
68220880
Test: Treehugger
Change-Id: Ia79966563cc0b5ab0923d54c21e54b6192d8c990
Exempt-From-Owner-Approval: Jeff Sharkey is an owner, but only one of his accounts is listed as an owner (@android.com vs. @google.com)
Treehugger Robot [Mon, 30 Oct 2017 15:25:27 +0000 (15:25 +0000)]
Merge "Quick Settings: Avoid expand indicators shortly showing on edit"
Treehugger Robot [Mon, 30 Oct 2017 03:00:55 +0000 (03:00 +0000)]
Merge "Define OWNERS for permission grant changes."
Jeff Sharkey [Fri, 27 Oct 2017 18:13:37 +0000 (12:13 -0600)]
Define OWNERS for permission grant changes.
Permission grant changes need explicit approval from product and
SWE leadership to ensure that CTS/CDD requirements are met.
Change-Id: I0a84712b5c5b4e11e72bf5921b72ef6a47e7fdc1
Treehugger Robot [Sun, 29 Oct 2017 17:48:44 +0000 (17:48 +0000)]
Merge "Add support for send Message with messaging options"
Adrian DC [Tue, 24 Oct 2017 19:17:03 +0000 (21:17 +0200)]
Quick Settings: Avoid expand indicators shortly showing on edit
* Upon entering of the Quick Settings edit view, during
the animation, all the expand indicators are rarely
visible for a short period of time until hidden
* To avoid this visual glitch, hide the expand_indicator
by default and let the code show it when necessary
instead of hiding it for most cases
Change-Id: Ia14d9a8d63178ccb54fbcb969ddf51f06c88f35c
Signed-off-by: Adrian DC <radian.dc@gmail.com>
Hall Liu [Fri, 27 Oct 2017 23:19:29 +0000 (23:19 +0000)]
Merge "EMBMS - Add TestApi and provide service override"
Treehugger Robot [Fri, 27 Oct 2017 21:12:24 +0000 (21:12 +0000)]
Merge "Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager."
Treehugger Robot [Fri, 27 Oct 2017 21:06:44 +0000 (21:06 +0000)]
Merge "Enable HID Device Profile Service (2/2)"
Treehugger Robot [Fri, 27 Oct 2017 20:55:53 +0000 (20:55 +0000)]
Merge "Handle alternate status values."
Tyler Gunn [Fri, 1 Sep 2017 22:17:05 +0000 (15:17 -0700)]
Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager.
When TelecomManager methods perform a read phonestate check from a work
profile user, it is possible to get an INTERACT_ACROSS_USERS exception.
This is due to the fact that the filterByIntent method was not calling
queryIntentActivitiesAsUser.
Test: Manual
Bug:
31304557
Merged-In: I6bc7419ba260050281d83e33f7f328ec5ccb3cd8
Change-Id: I2a1869162e5a52aed986a99cc378a6c630af4a70
Colin Cross [Fri, 27 Oct 2017 17:46:53 +0000 (10:46 -0700)]
Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES
LOCAL_SRC_FILES is expected to be a list of files relative to the
Android.mk files. If OUT_DIR is absolute then adding generated
files to the list produces bad paths when $(LOCAL_PATH)/ is prepended
to it. Put libcore's generated sources into
LOCAL_INTERMEDIATE_SOURCES instead.
Bug:
64930165
Bug:
68375156
Test: m checkbuild
Change-Id: I4b36fd192570ea0cd52d8537a16c078c726d97fd
Tyler Gunn [Fri, 25 Aug 2017 22:01:00 +0000 (15:01 -0700)]
Handle alternate status values.
Some carriers use sendrecv to indicate a call in a conference is active,
and sendonly to indicate that the remote party has held the call.
Adding support for these status values.
This ensures that remotely held calls for these carriers are set to held.
Test: Manual
Bug:
33272103
Merged-In: Ie386bdb4c77df1305d80f604f48174794c3ee0c1
Change-Id: I4a950c4e143d5ac396b30569dbda0b1cf4e92a3e
Treehugger Robot [Fri, 27 Oct 2017 19:09:47 +0000 (19:09 +0000)]
Merge "Ensure CallId is not null when connection creation is complete."
Treehugger Robot [Fri, 27 Oct 2017 18:41:59 +0000 (18:41 +0000)]
Merge "Fix: AccountManagerService crashed by accessing closed db"
Tyler Gunn [Sat, 17 Jun 2017 03:20:34 +0000 (20:20 -0700)]
Ensure CallId is not null when connection creation is complete.
When calling "get" on the mConnectoinById map, a null callId will result
in an NPE.
In findConnectionForAction, defaulting to returning the "null" connection
which is the same behavior as if it isn't found.
In notifyCreateConnectionComplete, specifically checking if the callId
is null and skipping the onCreateConnectionComplete callback.
This scenario is possible if the connection is remove from the
ConnectionService before the connection complete callback comes back from
Telecom.
Test: Manual
Fixes:
62588734
Merged-In: I1de7a0a4cc9c630019e38b8154bfc1d470f56ae3
Change-Id: Ie610c51155ed417e0f916000fe20e4484bdb6603
Manoj Boopathi Raj [Fri, 27 Oct 2017 17:32:56 +0000 (17:32 +0000)]
Merge "Fixed NullPointerException in IpSecService-Netd binder layer"
Cassie Han [Fri, 27 Oct 2017 17:17:54 +0000 (17:17 +0000)]
Merge "Add the operator name and MCC/MNC in string format into the CellIdentity."
Hans Boehm [Fri, 27 Oct 2017 17:15:41 +0000 (17:15 +0000)]
Merge "Don't allocate GlobalRefs for BinderProxy"
Hansong Zhang [Wed, 27 Sep 2017 21:17:20 +0000 (14:17 -0700)]
Enable HID Device Profile Service (2/2)
Add Profile Proxy for HID Device Profile.
* Add a helper method doUnbind() to deal with unbinding to Bluetooth HID
Service.
* Fix docstrings.
Bug:
63384609
Test: SL4A Bluetooth HID test
Change-Id: I168c21c3b010baac9889c556635b914c0ba3f267
Treehugger Robot [Fri, 27 Oct 2017 12:47:45 +0000 (12:47 +0000)]
Merge "Remove unused method on VersionedBroadcastListener"
Neil Fuller [Fri, 27 Oct 2017 09:54:15 +0000 (09:54 +0000)]
Merge changes from topic "tz_catchup1"
* changes:
Add newly available version information to dumpsys
Be more explicit about users
Erik Kline [Fri, 27 Oct 2017 05:16:56 +0000 (14:16 +0900)]
Remove unused method on VersionedBroadcastListener
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manually enabling USB tethering toward Wi-Fi worked
Bug:
32163131
Change-Id: I38e4b77a7d59584ebeb450ebe5a9dcbcb36f4fa1
Mengjun Leng [Mon, 13 Mar 2017 09:08:26 +0000 (17:08 +0800)]
Add support for send Message with messaging options
Add support for following messaging options.
1.Add support for message priority in 3gpp2.
2.Add link control support while sending multiple messages.
3.Add validity period support in 3gpp.
Change-Id: I19f4fbc5a3b6922884196b301d30280acd9e501e
MSIM(Telephony): Add changes to SMS APIs as per new SmsManager design
Change SMS Msim APIs as per new SmsManager design
Change-Id: I14ad7685e23b14203a76dfe3cc5a95a337f7d0e3
Hans Boehm [Fri, 27 Oct 2017 03:27:29 +0000 (03:27 +0000)]
Merge "Convert Binder & BinderProxy to NativeAllocationRegistry"
Tetsutoki Shiozawa [Tue, 24 Oct 2017 09:44:00 +0000 (18:44 +0900)]
Fix: AccountManagerService crashed by accessing closed db
Symptom:
When a current user was switched, AccountManagerService crashed with
IllegalStateException.
Root cause:
accountsDb was closed when user was stopped. AccountManagerService
tried to insert a log record to the closed db and it failed.
Solution:
It catches the exception if it's failed to insert a log record.
Bug:
68233592
Change-Id: I97b63e4777bf7f8a1d38d96e494f6a21847d374b
Treehugger Robot [Fri, 27 Oct 2017 00:49:19 +0000 (00:49 +0000)]
Merge "IMMS should preserve enabled/selected IMEs upon boot"
Hall Liu [Fri, 20 Oct 2017 18:30:16 +0000 (11:30 -0700)]
EMBMS - Add TestApi and provide service override
Add @TestApi annotations to methods that CTS needs
Add a manifest meta-data key that allows client apps to specify the
exact component name of the MBMS service to bind to.
Bug:
68049452
Test: CTS
Change-Id: I50654c41da38696a25fad93d0a5e0b0c11fa0b42
Yohei Yukawa [Thu, 26 Oct 2017 22:00:59 +0000 (15:00 -0700)]
IMMS should preserve enabled/selected IMEs upon boot
This is a follow up CL to my refactoring CL [1], which unintentionally
changed the condition to reset default enabled IMEs when the device
boots up.
Previously, InputMethodManagerService (IMMS) resets default enabled
IMEs upon device boot only for the first boot scenario, by checking
whether Settings.Secure.DEFAULT_INPUT_METHOD is already set or not.
My refactoring CL accidentally replaced that check with unconditional
"true", which means now IMMS always resets default enabled IMEs every
time the device boots up. This behavior change is of course
unintentional but has no effect after the user unlocks the device
because IMMS also discard all the settings change made while
UserManager.isUserUnlocked() returns false [2]. Hence the above
behavior change is completely hidden on direct-boot disabled devices,
where the system behaves as if the user unlocked the device
immediately after the boot is completed. The behavior change is
observable only on direct-boot devices.
Anyway, IMMS should try to do its best to keep the last used IME and
user selected IMEs even in user locked state as long as those IMEs
are compatible with direct-boot. This CL revives the previous
behavior by adding the same condition check again.
[1]: I5b37c450db4b25b3e635b6d634293a34eec8b9d4
7924782c000733b2d7a180701b74988f0154adee
[2]: Ifa2225070bf8223f8964cf063c86889e312c5e9a
ed4952ad0f76a70549777472cd9cefcbc8705917
Fixes:
67093433
Fixes:
67491290
Test: Manually verified as follows
1. Check out AOSP master
2. Build an OS image for a direct-boot aware device then
flash it.
3. Open
development/samples/SoftKeyboard/AndroidManifest.xml
then add
android:directBootAware="true"
to the IME service.
4. Open
development/samples/SoftKeyboard/res/xml/method.xml
then add
android:isAsciiCapable="true"
to "en_US" IME subtype.
5. tapas SoftKeyboard
6. make -j
7. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
8. Open system settings:
System -> Languages & input -> Virtual keyboard
-> Manage keyboards
9. Enable Sample Soft keyboard
10. Disable Android Keyboard (AOSP)
11. Open system settings:
Security -> Screen lock -> Password
then set up a device password "aaaa".
12. Reboot the device.
13. Make sure that
* Sample Soft keyboard is shown in the unlock screen.
* AOSP Keyboard is not enabled in the unlock screen.
Change-Id: Id624d577d941245cca944498dc6935eb364865cf
Hans Boehm [Wed, 4 Oct 2017 01:01:20 +0000 (18:01 -0700)]
Don't allocate GlobalRefs for BinderProxy
This removes all GlobalRef allocation as part of building BinderProxys.
Previously these were used to map IBinders to the corresponding
Java object, so the Java objects could be reused. We now keep
that mapping at the Java level.
This means we often need to call into Java to look up or allocate
a BinderProxy. But this replaces a prior call to Java to dereference
a WeakReference. The Java custom Java map-to-WeakReference data
structure is probably not terribly efficient, but the original
attachement mechanism did not seem to be either. And this
avoids potentially even more catastrophic issues when the number
of GlobalRefs approaches its limit.
We decrease GC triggering frequency from 200 to 1000 allocated
references. This now only applies to other kinds of JNI References
allocated by Binder.
I saw a maximum bucket size of 16 for the ProxyMap data structure
while briefly exercising a freshly booted device. That occurred
in system_server.
Bug:
65760710
Test: Built and booted master with some debugging output. Looks sane.
Change-Id: I322c4d8e9c8e198586d591580c2cdbb094906677
Manoj Boopathi Raj [Thu, 26 Oct 2017 18:49:02 +0000 (11:49 -0700)]
Fixed NullPointerException in IpSecService-Netd binder layer
Replaced null with empty byte array in createTransportModeTransform
for null auth.getKey, crypt.getKey() and authCrypt.getKey()
Test: Ran CTS test
Bug:
68052730
Change-Id: I5110b1297b4bfbb5766e8ecfd3d64f8110b52945
Hugo Benichi [Thu, 26 Oct 2017 06:01:06 +0000 (06:01 +0000)]
Merge changes I59b6e04f,I55694d89
* changes:
Remove Parcelable interface from DefaultNetworkEvent
Extract logging of default network events
Treehugger Robot [Thu, 26 Oct 2017 01:52:40 +0000 (01:52 +0000)]
Merge "HwBinder: Clean up code, add logging"
Colin Cross [Thu, 26 Oct 2017 01:01:08 +0000 (01:01 +0000)]
Merge "Convert framework-protos to Android.bp"
Hans Boehm [Fri, 29 Sep 2017 01:16:50 +0000 (18:16 -0700)]
Convert Binder & BinderProxy to NativeAllocationRegistry
Change the Java BinderProxy to only contain a single native pointer,
so that we can get by with a single NativeAllocationRegistry
registration. This adds some indirections and a new allocation. But it
marginally reduces the number of (expensive) JNI field lookups from
native code, and the extra allocation involves significantly less
overhead than registering each object twice. This also cleans up the
code a little by avoiding some explicit reference count adjustments.
Change BinderProxy Binder to use NativeAllocationRegistry instead of
finalize().
Change the mObject field in Binder to hold a non-reference-counted
but owning pointer to JavaBBinderHolder. Have JavaBBinderHolder no
longer inherit from RefBase.
Make it clear that neither Binder.mObject, not BinderProxy.mNativeData
can be null. Remove null checks.
Avoid checking for null returns from C++ new. It would throw
anyway, which would cause the process to abort.
Test: Booted master.
Bug:
65760710
Change-Id: I323d4bdc7e25f8c27b847b6fe2c073eac3f2efe5
Hans Boehm [Thu, 26 Oct 2017 00:01:12 +0000 (00:01 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()"
Treehugger Robot [Wed, 25 Oct 2017 22:08:36 +0000 (22:08 +0000)]
Merge "android.os.HwBinder: fix native static method signature"
Andreas Gampe [Wed, 25 Oct 2017 20:03:24 +0000 (13:03 -0700)]
HwBinder: Clean up code, add logging
Used ScopedUtfChars to handle lifetime, and correctly throw NPE. It
is illegal to call JNI String functions with a null argument.
Output the service name when starting a thread pool to aid debugging.
Bug:
68217725
Test: m
Test: Device boots
Change-Id: Ie40d3e77a63918330ef1a8a9e0c294f2c451a52a
Dianne Hackborn [Tue, 1 Aug 2017 00:38:53 +0000 (17:38 -0700)]
Fix issue #
64224738: Document return value of IBinder.transact()
Also add appropriate @NonNull and @Nullable annotations.
Test: built
Change-Id: I22de48105ef685baf594cfc004dd3e27e2ba09e9
Merged-In: I22de48105ef685baf594cfc004dd3e27e2ba09e9
(cherry picked from commit
4cd650c0085e6dd20d3f46c5b668e54537f887cf)
Brad Ebinger [Wed, 25 Oct 2017 20:36:17 +0000 (20:36 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom."
Yifan Hong [Wed, 25 Oct 2017 20:19:22 +0000 (13:19 -0700)]
android.os.HwBinder: fix native static method signature
Test: pass
Change-Id: I54c384abaad7c7aafab31836f34edee5c7c75aac
Jordan Liu [Wed, 25 Oct 2017 18:22:31 +0000 (18:22 +0000)]
Merge "Make it possible to dial an operator specific code"
Treehugger Robot [Wed, 25 Oct 2017 17:16:03 +0000 (17:16 +0000)]
Merge "Improve NetworkCapabilities docs."
Cassie [Wed, 20 Sep 2017 21:02:13 +0000 (14:02 -0700)]
Add the operator name and MCC/MNC in string format into the CellIdentity.
Bug:
63984327
Test: Basic telephony sanity
Change-Id: Ia5e7f5b980efbde647f95f3e83a62d56132b90da
Treehugger Robot [Wed, 25 Oct 2017 13:37:40 +0000 (13:37 +0000)]
Merge "Switch to listening for CarrierConfig changes for provisioning rechecks"
Neil Fuller [Wed, 4 Oct 2017 16:04:38 +0000 (17:04 +0100)]
Add newly available version information to dumpsys
The tzlookup.xml file now contains a rules version
so we can output that from dumpsys timezone now
too. That is used in xTS tests to confirm that
the correct tzlookup.xml file is being used
on device.
Bug:
65575839
Test: PTS: run pts -m PtsTimeZoneTestCases
Change-Id: Ib8cd3a41c625c6b442c0b9775108e4015ed020e2
Merged-In: Ib8cd3a41c625c6b442c0b9775108e4015ed020e2
(cherry picked from commit
c90361404a1560d60756e4199af04d25ef688e2c)
Neil Fuller [Fri, 22 Sep 2017 14:32:06 +0000 (15:32 +0100)]
Be more explicit about users
Be more explicit about users executing processes in the time
zone updates code.The code was already running everything as the
system user but now that's more explicit / by design.
To service unit tests:
make -j30 FrameworksServicesTests
adb install -r -g "${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Bug:
64111659
Test: Unit tests: See above
Test: Manual testing installing updates as secondary device user
Test: PTS: run pts -m PtsTimeZoneTestCases
Change-Id: Idb754f3e1aa3830ba1ada8ef5740f9f7340f03d5
Merged-In: Idb754f3e1aa3830ba1ada8ef5740f9f7340f03d5
(cherry picked from commit
1281f39f86a8e4d9950581fb1f15245843856c23)
Steven Moreland [Wed, 25 Oct 2017 04:50:08 +0000 (04:50 +0000)]
Merge "Revert "HIDL Java getService now the same as C++.""
Steven Moreland [Wed, 25 Oct 2017 04:46:26 +0000 (04:46 +0000)]
Revert "HIDL Java getService now the same as C++."
Appears to be causing problems on 2017 devices.
This reverts commit
c1f00f8cd895e38c74ed1cb1adff33065ccecd06.
Change-Id: I6c1717a612bfa3fe63f08160a1db652c284f6ba4
Colin Cross [Wed, 25 Oct 2017 04:43:08 +0000 (04:43 +0000)]
Merge changes from topic "keystorebp"
* changes:
Convert lockregioncodeinjection to Android.bp
Export AIDL for keystore Android.bp.
Hugo Benichi [Thu, 19 Oct 2017 05:58:15 +0000 (14:58 +0900)]
Remove Parcelable interface from DefaultNetworkEvent
This patch takes advantage of the direct DefaultNetworkMetrics interface
between ConnectivityService and IpConnectivityMetrics and removes the
Parcelable interface from DefaultNetworkEvent.
IpConnectivityMetrics, IpConnectivityEventBuilder and associated tests
are updated as necessary.
Bug:
34901696
Test: runtest frameworks-net
Change-Id: I59b6e04fc126051320d08a422cfbd4d27042123e
Hugo Benichi [Thu, 19 Oct 2017 05:42:40 +0000 (14:42 +0900)]
Extract logging of default network events
This patch extracts the logging of DefaultNetworkEvent from inside
ConnectivityService and move it to a new DefaultNetworkMetrics class.
The DefaultNetworkMetrics is a singleton owned by the
IpConnectivityMetrics singleton implementing the metrics service for
core networking. ConnectivityService has access to this singleton via
LocalServices.
This class layout will allow to remove the Parcelable interface of
DefaultNetworkEvent and will instead let the IpConnectivityMetrics
service grab metrics from the DefaultNetworkMetrics directly.
Bug:
34901696
Test: runtest frameworks-net
Change-Id: I55694d89124272732aba114198776462372de18b
Jeff Sharkey [Wed, 25 Oct 2017 03:25:50 +0000 (21:25 -0600)]
Improve NetworkCapabilities docs.
Add IntDef for constants, and rely on new auto-documentation feature
to expand all of them at usage sites.
Test: docs-only change
Bug:
64133169
Change-Id: I8a6b5f54c8eb9d4fc7ae3d0d3fb673d52320664b
Treehugger Robot [Wed, 25 Oct 2017 02:34:18 +0000 (02:34 +0000)]
Merge changes I119cf83a,Icc5a1e38,If07a04d3
* changes:
Binder: Update to new ScopedLocalRef
Binder: Clean up JNI code
Binder: Change reaction to Error
Treehugger Robot [Wed, 25 Oct 2017 01:53:16 +0000 (01:53 +0000)]
Merge "HIDL Java getService now the same as C++."
Colin Cross [Tue, 24 Oct 2017 23:21:22 +0000 (16:21 -0700)]
Convert framework-protos to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: Id7992ff0cc5d631b64c1fa8e82e8a130ea508236
Andreas Gampe [Thu, 21 Sep 2017 17:55:59 +0000 (10:55 -0700)]
Binder: Update to new ScopedLocalRef
Follow-up to commit
625e0007ac07c5aefb4b3d486575ab916116c129 and
commit
fac8cb2405999d18aefd75387a5bbdb0c6160e7f.
(cherry picked from commit
8571ec370da1b629aa8eb7267f139f1610627857)
Bug:
64689630
Test: m
Merged-In: I119cf83a5a54c15973ed3701ee448a9590bb404d
Change-Id: I119cf83a5a54c15973ed3701ee448a9590bb404d
Andreas Gampe [Sat, 9 Sep 2017 00:44:05 +0000 (17:44 -0700)]
Binder: Clean up JNI code
Factor out Error handling code and clean up. Use ScopedLocalRef,
fix minor logic issues.
(cherry picked from commit
625e0007ac07c5aefb4b3d486575ab916116c129)
Bug:
64689630
Test: m
Test: manual test
Merged-In: Icc5a1e38fa66aa79d87d0abb81acef6918ca78f5
Change-Id: Icc5a1e38fa66aa79d87d0abb81acef6918ca78f5
Andreas Gampe [Sat, 9 Sep 2017 00:44:05 +0000 (17:44 -0700)]
Binder: Change reaction to Error
Instead of aborting immediately with a native error, try to call
Thread.dispatchUncaughtException to trigger a Java-side abort.
Only fall back to the old strategy if this fails.
(cherry picked from commit
1cd76f5c93bc1e2409c880cade19a323cd999aed)
Bug:
64689630
Test: m
Test: manual test
Merged-In: If07a04d3769f3b9181c4736220333df9a2871a16
Change-Id: If07a04d3769f3b9181c4736220333df9a2871a16
Colin Cross [Fri, 20 Oct 2017 20:00:58 +0000 (13:00 -0700)]
Convert lockregioncodeinjection to Android.bp
See build/soong/README.md for more information
Test: m checkbuild
Change-Id: I78e91a70e786df8e6722c6ec3fe762371e8f475a
Jeff Sharkey [Mon, 23 Oct 2017 22:04:31 +0000 (16:04 -0600)]
Export AIDL for keystore Android.bp.
Test: builds, boots
Bug:
67041047
Change-Id: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1
Merged-In: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1
(cherry picked from commit
0c686e78ad2fbfc9e814bdd3abc5bd66c858c60f)
Kazuya Ohshiro [Wed, 27 Sep 2017 07:02:55 +0000 (16:02 +0900)]
Make it possible to dial an operator specific code
Added a new array config that indicating list of
FAC (feature access codes) to dial as a normal call.
Test: manual - Checked that special codes which configured in
CarrierConfig are dialed as a normal call.
Bug:
67664279
Change-Id: I1c4b60ae4f28c25e55b38563fe445f831793d466
Treehugger Robot [Tue, 24 Oct 2017 22:22:57 +0000 (22:22 +0000)]
Merge "Copy layout file of preference category from Settings."
Malcolm Chen [Thu, 1 Jun 2017 23:35:43 +0000 (16:35 -0700)]
Copy layout file of preference category from Settings.
Platform packages other than Settings may also use this layout to
be consistent with Settings.
Test: manual
bug:
62200881
Change-Id: I9e45772abac5aacfabbbafb38e287d0b523ef694
Merged-In: I9e45772abac5aacfabbbafb38e287d0b523ef694
Benedict Wong [Tue, 24 Oct 2017 16:44:59 +0000 (16:44 +0000)]
Merge "Return a port from bindToPort() in IpSecService"
am:
9305fb7ea1
Change-Id: I51705d5db6af560f2423ef7861bfde6734632ec9
Benedict Wong [Tue, 24 Oct 2017 16:31:21 +0000 (16:31 +0000)]
Merge "Return a port from bindToPort() in IpSecService"
Benoit Lamarche [Tue, 24 Oct 2017 08:54:09 +0000 (08:54 +0000)]
Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection"
am:
5aa4dafa58
Change-Id: Ic8f892399cdfa746a2fab4a841469f41f0fe98f5
Benoit Lamarche [Tue, 24 Oct 2017 08:42:10 +0000 (08:42 +0000)]
Merge "Use ASM6 Opcodes everywhere in locked_region_code_injection"
Paul Duffin [Tue, 24 Oct 2017 07:59:35 +0000 (07:59 +0000)]
Merge "Preserve order of shared library files"
am:
596bb64796
Change-Id: I95c1cd65ded3b3d14b7f916c8a10825399e7b8ec
Paul Duffin [Tue, 24 Oct 2017 07:48:13 +0000 (07:48 +0000)]
Merge "Preserve order of shared library files"
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:27:23 +0000 (06:27 +0000)]
Merge changes from topic "bt_get_cod"
am:
35dc02004c
Change-Id: Iec67ef3cc9c990b4d5285b23b51972915cbbd335
Treehugger Robot [Tue, 24 Oct 2017 06:14:37 +0000 (06:14 +0000)]
Merge changes from topic "bt_get_cod"
* changes:
Add missing intents to protected broadcasts
Get Bluetooth Class of Device
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:13:48 +0000 (06:13 +0000)]
Merge "Persist Bluetooth CoD config value across reboot"
am:
ba45409c92
Change-Id: I4d28d0b1b52e587285d3b92b66fdc4b6c1b38720
Pulkit Bhuwalka [Tue, 26 Sep 2017 02:19:46 +0000 (19:19 -0700)]
Add missing intents to protected broadcasts
Intents broadcasted by the Bluetooth stack need to be added to protected
broadcasts else they complain with errors in the log since Bluetooth is
considered a system process. A few of these intents, especially AVRCP
intents were missing in the list.
Bug: None
Test: Verified errors don't show up after introducing the intents while
playing on a sink device.
Change-Id: Ie283c50243d9a1bac3fd937f58bc1ddc20867d2f
Pulkit Bhuwalka [Wed, 20 Sep 2017 22:10:45 +0000 (15:10 -0700)]
Get Bluetooth Class of Device
Adds API to fetch Bluetooth CoD value of the stack. The API is hidden to
only be used by System code.
Bug:
36015415
Test: Verified fetching of COD from test app on flashed device, after modification
and after after reboot.
Change-Id: Ie35ecf141704c2aac46678da7cabdc7203a088f2
Treehugger Robot [Tue, 24 Oct 2017 06:05:45 +0000 (06:05 +0000)]
Merge "Persist Bluetooth CoD config value across reboot"
Hugo Benichi [Tue, 24 Oct 2017 00:14:48 +0000 (00:14 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats"
am:
64ef2a4d28
Change-Id: I7f25f4ed42f0aecea7a1bb09b8c65a5d2e4a84cd
Hugo Benichi [Mon, 23 Oct 2017 23:54:53 +0000 (23:54 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats"
Hansong Zhang [Mon, 23 Oct 2017 22:33:50 +0000 (22:33 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)"
am:
8218b219f3
Change-Id: Ic085deaa070b4008b34d03b507f81a5df220764a
Treehugger Robot [Mon, 23 Oct 2017 22:22:41 +0000 (22:22 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)"
Hansong Zhang [Fri, 20 Oct 2017 22:55:59 +0000 (15:55 -0700)]
Change Bluetooth HID Profile Name (1/6)
Make the Bluetooth HID profile name consistent with the Bluetooth HID service
name.
BluetoothInputHost → BluetoothHidDevice
BluetoothInputDevice → BluetoothHidHost
IBluetoothInputHost → IBluetoothHidDevice
IBluetoothInputDevice → IBluetoothHidHost
BluetoothProfile.INPUT_HOST → BluetoothProfile.HID_DEVICE
BluetoothProfile.INPUT_DEVICE → BluetoothProfile.HID_HOST
(Cherry-picked from commit
c26c76c63d933f8057f795d05624f91b811c8c71)
Merged-In: Iadb890a54dd3d6868b87514472bbac6bb0c6179f
Bug:
68055651
Test: make
Change-Id: Iadb890a54dd3d6868b87514472bbac6bb0c6179f
Jordan Liu [Mon, 23 Oct 2017 20:39:20 +0000 (20:39 +0000)]
Merge "Add config to display VM number as default number of CF"
am:
3e26cb18fb
Change-Id: Ie332a31b699b375d7a9ff56f314346546244010e