OSDN Git Service
Colin Cross [Tue, 31 Oct 2017 15:33:53 +0000 (15:33 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
am:
834be81189
Change-Id: Iec1547cc91bf3cb08a47194e91838eb77b4126d7
Treehugger Robot [Tue, 31 Oct 2017 15:24:11 +0000 (15:24 +0000)]
Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"
Tobias Thierer [Tue, 31 Oct 2017 13:41:34 +0000 (13:41 +0000)]
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
am:
b519569eb3
Change-Id: Ib9099673a4b643b10f38a0c94ddea49949f796eb
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"
Hansong Zhang [Tue, 31 Oct 2017 02:40:45 +0000 (02:40 +0000)]
Merge "Fix Robolectric Bluetooth tests"
am:
01c9c0e4ba
Change-Id: I7987ddaa520c202a15af03bf0791c39a1720d3b3
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:51:28 +0000 (17:51 +0000)]
Merge "Track moving of OkHttp facade API to new package."
am:
45183fc5a7
Change-Id: Ied0bf8a62be2dd2038adf3de2251419bf5f3e964
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)
Adrian DC [Mon, 30 Oct 2017 15:42:14 +0000 (15:42 +0000)]
Merge "Quick Settings: Avoid expand indicators shortly showing on edit"
am:
47c83a5f9d
Change-Id: Id07c6a9413fb3f647d8ead5a77012800ce5b1bc8
Treehugger Robot [Mon, 30 Oct 2017 15:25:27 +0000 (15:25 +0000)]
Merge "Quick Settings: Avoid expand indicators shortly showing on edit"
Jeff Sharkey [Mon, 30 Oct 2017 03:11:43 +0000 (03:11 +0000)]
Merge "Define OWNERS for permission grant changes."
am:
8d2a5bd42a
Change-Id: Ib91c1ecc3d673ba103f966008609d2444107eb7e
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
Mengjun Leng [Sun, 29 Oct 2017 17:58:43 +0000 (17:58 +0000)]
Merge "Add support for send Message with messaging options"
am:
1400db6748
Change-Id: I29ffbb64c35214761b7f6921212920cf8ffc8599
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:32:58 +0000 (23:32 +0000)]
Merge "EMBMS - Add TestApi and provide service override"
am:
1fab41e771
Change-Id: I5c44393e98c432b3c7a28c7b5b1906aa80f62372
Hall Liu [Fri, 27 Oct 2017 23:19:29 +0000 (23:19 +0000)]
Merge "EMBMS - Add TestApi and provide service override"
Tyler Gunn [Fri, 27 Oct 2017 21:37:34 +0000 (21:37 +0000)]
Merge "Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager."
am:
6d0f1eff8b
Change-Id: I55e7f4684f8160f70548e662cd030fce565b16a9
Hansong Zhang [Fri, 27 Oct 2017 21:27:03 +0000 (21:27 +0000)]
Merge "Enable HID Device Profile Service (2/2)"
am:
7e3fbd59d1
Change-Id: I993b08e37f0ebcc7bca0b2b536348c41dd548861
Tyler Gunn [Fri, 27 Oct 2017 21:13:30 +0000 (21:13 +0000)]
Merge "Handle alternate status values."
am:
b728e56959
Change-Id: I1c82dd103b03eecba025a7638e06906699429c74
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
Tyler Gunn [Fri, 27 Oct 2017 19:26:07 +0000 (19:26 +0000)]
Merge "Ensure CallId is not null when connection creation is complete."
am:
47b23176bd
Change-Id: Ifddd99f22edfa787a3447cbaa66dd4e70a430ba3
Treehugger Robot [Fri, 27 Oct 2017 19:09:47 +0000 (19:09 +0000)]
Merge "Ensure CallId is not null when connection creation is complete."
Tetsutoki Shiozawa [Fri, 27 Oct 2017 18:53:20 +0000 (18:53 +0000)]
Merge "Fix: AccountManagerService crashed by accessing closed db"
am:
6ac8f42d9e
Change-Id: I35f289e43a7406087a13258b5e6cbf5e179dc529
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:47:08 +0000 (17:47 +0000)]
Merge "Fixed NullPointerException in IpSecService-Netd binder layer"
am:
bf74a93eb2
Change-Id: Ia73c6bda7cb265f91648139e15f4bd2668e6c531
Cassie Han [Fri, 27 Oct 2017 17:36:52 +0000 (17:36 +0000)]
Merge "Add the operator name and MCC/MNC in string format into the CellIdentity."
am:
1565803cd2
Change-Id: Ie0a1305eb73256f358a853d87778f755d3b9e4d0
Manoj Boopathi Raj [Fri, 27 Oct 2017 17:32:56 +0000 (17:32 +0000)]
Merge "Fixed NullPointerException in IpSecService-Netd binder layer"
Hans Boehm [Fri, 27 Oct 2017 17:28:39 +0000 (17:28 +0000)]
Merge "Don't allocate GlobalRefs for BinderProxy"
am:
1455a1d0c0
Change-Id: Id971af4742bb26790449c78f9520b9a7744df39a
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
Erik Kline [Fri, 27 Oct 2017 13:04:47 +0000 (13:04 +0000)]
Merge "Remove unused method on VersionedBroadcastListener"
am:
536d241fb2
Change-Id: I63c8ad050330dd4e938388d03fa9cf270b108e56
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 10:13:15 +0000 (10:13 +0000)]
Merge changes from topic "tz_catchup1"
am:
4e0a02ce1f
Change-Id: I629930379afd2e3037bbd460ebc83726a8bb0008
Neil Fuller [Fri, 27 Oct 2017 10:08:35 +0000 (10:08 +0000)]
Be more explicit about users
am:
b755291e65
Change-Id: I0dd17273997adc207b5e389624b820e80ccaaa89
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
Hans Boehm [Fri, 27 Oct 2017 03:47:51 +0000 (03:47 +0000)]
Merge "Convert Binder & BinderProxy to NativeAllocationRegistry"
am:
bd6d3c5743
Change-Id: Iae1e438cc9595efe1dd68c579d42ae129ac53e5e
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
Yohei Yukawa [Fri, 27 Oct 2017 01:10:36 +0000 (01:10 +0000)]
Merge "IMMS should preserve enabled/selected IMEs upon boot"
am:
171c82acb4
Change-Id: I13b12269eb1cd29bb28bd6a1dadac59a2d539380
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:13:39 +0000 (06:13 +0000)]
Merge changes I59b6e04f,I55694d89
am:
9009eabbfe
Change-Id: I217e32a7ab25fd73f3361015efae9bbbd1fde0f4
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
Andreas Gampe [Thu, 26 Oct 2017 02:03:47 +0000 (02:03 +0000)]
Merge "HwBinder: Clean up code, add logging"
am:
28ed91161d
Change-Id: Ie7d511812c6dc419ca793c28a4cee1150a90bd66
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:11:13 +0000 (01:11 +0000)]
Merge "Convert framework-protos to Android.bp"
am:
d4609af986
Change-Id: I6ebf88a0931b7f9f49ac8044deb46b100129bb9f
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:12:52 +0000 (00:12 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()"
am:
ceb336fc8a
Change-Id: Ibcd3386a93a3bb5de8fb84a178678dab67beb464
Hans Boehm [Thu, 26 Oct 2017 00:01:12 +0000 (00:01 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()"
Yifan Hong [Wed, 25 Oct 2017 22:29:45 +0000 (22:29 +0000)]
Merge "android.os.HwBinder: fix native static method signature"
am:
65944e79b2
Change-Id: I09295da4a6021bd02c5c5e89d1d4ce3a8be82c96
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:50:54 +0000 (20:50 +0000)]
Merge "Fix dial emergency call redial issue by China Unicom."
am:
3ab81b9694
Change-Id: I3895caab83c75a8f0d0251da6154d5a93fe09694
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:40:33 +0000 (18:40 +0000)]
Merge "Make it possible to dial an operator specific code"
am:
f4f4ba3d42
Change-Id: I9af399f6ab0d5f95e76b0fd3cc769acc6a75a5b5
Jordan Liu [Wed, 25 Oct 2017 18:22:31 +0000 (18:22 +0000)]
Merge "Make it possible to dial an operator specific code"
Jeff Sharkey [Wed, 25 Oct 2017 17:25:17 +0000 (17:25 +0000)]
Merge "Improve NetworkCapabilities docs."
am:
14a51058b1
Change-Id: Ib3c6dd78c7ed41526a734fbc91a81cb4c7fae6d7
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
Erik Kline [Wed, 25 Oct 2017 13:47:31 +0000 (13:47 +0000)]
Merge "Switch to listening for CarrierConfig changes for provisioning rechecks"
am:
c21effd526
Change-Id: I58dfd65873b65a59b832afea88f8d246b088aa6b
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 05:17:19 +0000 (05:17 +0000)]
Merge "Revert "HIDL Java getService now the same as C++.""
am:
65d1e549b6
Change-Id: I545166bd11ee2a38b43743ebb4559429e1b22349
Colin Cross [Wed, 25 Oct 2017 05:07:24 +0000 (05:07 +0000)]
Merge changes from topic "keystorebp"
am:
a12eab69d1
Change-Id: I4a6f7f84d683582d126a6370e1cf3ae6ee9f4b19
Jeff Sharkey [Wed, 25 Oct 2017 05:01:29 +0000 (05:01 +0000)]
Export AIDL for keystore Android.bp.
am:
01478ec183
Change-Id: Ie2308e809410e1c8237095c7f74bce08b8f76397
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
Andreas Gampe [Wed, 25 Oct 2017 02:53:19 +0000 (02:53 +0000)]
Merge changes I119cf83a,Icc5a1e38,If07a04d3
am:
61e3189ec7
Change-Id: I2ef7c49b23314a5cb94671bba0d3891b6b7c3920
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
Steven Moreland [Wed, 25 Oct 2017 02:02:44 +0000 (02:02 +0000)]
Merge "HIDL Java getService now the same as C++."
am:
0c41ad872f
Change-Id: I9e161fd316d0bae5f3e4449adcb454924531fe11
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