Commit Graph

284816 Commits

Author SHA1 Message Date
Yifan Hong
7fbbc2e85d Merge changes from topic 'libvintf_cp'
am: 9bd4c20764

Change-Id: I277b37789fdc78ed2dcb5c50c1fda9c40444a4e8
2017-05-06 00:18:51 +00:00
Yifan Hong
dd4156cb43 Add compatibility matrices to VintfObject.report()
am: 4463d991be

Change-Id: I26c78cca5e807ee291bdb097d11d5f4ac43bba29
2017-05-06 00:17:26 +00:00
Treehugger Robot
9bd4c20764 Merge changes from topic 'libvintf_cp'
* changes:
  android.os.VintfObject: add API for EDI.
  Add compatibility matrices to VintfObject.report()
2017-05-06 00:11:33 +00:00
Ruben Brunk
0b34d001e4 Merge "Fix Bluetooth GATT API default handler assignment"
am: 612b8bef0c

Change-Id: Ia71233576b7f8a712abf495164923a092cdc5677
2017-05-05 23:39:50 +00:00
Treehugger Robot
612b8bef0c Merge "Fix Bluetooth GATT API default handler assignment" 2017-05-05 23:28:40 +00:00
Colin Cross
d1d283692f Merge "Update path for libmediandk headers"
am: 9d9aab48fa

Change-Id: I339300d2e0c230069af0a7f08caff6449de37c85
2017-05-05 22:32:11 +00:00
Colin Cross
9d9aab48fa Merge "Update path for libmediandk headers" 2017-05-05 22:25:07 +00:00
Ruben Brunk
c131051e28 Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.

This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.

Bug: 37544152
Bug: 37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
(cherry picked from commit 6bdc550e27)
2017-05-05 22:22:50 +00:00
Android Build Merger (Role)
da0363104c Merge "Merge changes from topic 'update-conscrypt' am: c497348c74" into stage-aosp-master 2017-05-05 21:18:57 +00:00
Kenny Root
a98eb45c28 Merge changes from topic 'update-conscrypt'
am: c497348c74

Change-Id: Ifa261c6c003f3e0ca767356bc98c2c3033bd699a
2017-05-05 21:16:47 +00:00
Kenny Root
37607dfca6 Merge changes from topic 'update-conscrypt'
am: c497348c74

Change-Id: Ie3b9d74ff46be9e4b00c6efe6748feb5e096cd3a
2017-05-05 21:10:11 +00:00
Kenny Root
0634c4f77f Track updates to Conscrypt
am: 7fdce769c3

Change-Id: I691f1ed588814311363f67b8ce43cbe247e54b71
2017-05-05 21:08:48 +00:00
Kenny Root
c497348c74 Merge changes from topic 'update-conscrypt'
* changes:
  Delete obsolete and unused KeyStoreTests
  Track updates to Conscrypt
2017-05-05 21:00:40 +00:00
Colin Cross
2a5d782689 Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.

Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit c8ed45d38f)
2017-05-05 13:05:55 -07:00
Arun
94f4f5e45f Merge "Reduce hwui CPU time by using glDrawRangeElements"
am: 057c7c3164

Change-Id: I32269ea47f637597efc73acc4e040c209b48a2ed
2017-05-05 18:58:47 +00:00
Treehugger Robot
057c7c3164 Merge "Reduce hwui CPU time by using glDrawRangeElements" 2017-05-05 18:50:13 +00:00
Colin Cross
f0d951361b Merge "Convert libhwui to Android.bp"
am: 31fb17bbf9

Change-Id: I66401c892f90131e21efb36dc7316f905bd729d2
2017-05-05 15:28:42 +00:00
Treehugger Robot
31fb17bbf9 Merge "Convert libhwui to Android.bp" 2017-05-05 15:17:23 +00:00
Arun
b0a9477c8e Reduce hwui CPU time by using glDrawRangeElements
The CPU overhead of glDrawElements in the GPU driver is significant
with client-side vertex data (unique per draw call) as the driver has
to calculate the mininimum and maximum indices from the index buffer
in order to evaluate the range of vertex data required. This can be
avoided by keeping track of the min-max in hwui and passing it with
glDrawRangeElements. This requires OpenGL ES3.0 support (which is
already checked for elsewhere in hwui).

Test: manual - visual inspection on fugu (nexus player)

Change-Id: I57bb1ddd239a1032f74f1cd2683bbe0970e84bd9
2017-05-05 15:11:27 +00:00
Neil Fuller
0a6aeccab2 Merge "Add (disabled) time zone update system server impl"
am: cba224e833

Change-Id: I603af513ae8170a1fac6e2e2fdc364ecbea0abfd
2017-05-05 14:17:02 +00:00
Treehugger Robot
cba224e833 Merge "Add (disabled) time zone update system server impl" 2017-05-05 14:06:23 +00:00
Nicolas Geoffray
2ea3874427 Merge "Handle safe mode in PackageManager."
am: a34610cebc

Change-Id: Iddfa0f1cee457214aa9e6b0235865f0cebac7667
2017-05-05 08:45:39 +00:00
Nicolas Geoffray
a34610cebc Merge "Handle safe mode in PackageManager." 2017-05-05 08:37:18 +00:00
Yifan Hong
bf49821c39 android.os.VintfObject: add API for EDI.
Add APIs for EDI (extensive device information).

Test: CtsDeviceInfo
Bug: 28656227
Change-Id: I609d4f1f07e20717827ef024ff8cbe124d7e54a6
Merged-In: I609d4f1f07e20717827ef024ff8cbe124d7e54a6
2017-05-04 20:01:32 -07:00
Yifan Hong
4463d991be Add compatibility matrices to VintfObject.report()
Test: FrameworksCoreTests
Bug: 36814503
Change-Id: I27eaea136437afb2102581d410b657e810612a0a
Merged-In: I27eaea136437afb2102581d410b657e810612a0a
2017-05-04 20:00:30 -07:00
Adrian Roos
6b1d176936 Merge "Update carrier text when phone service state is changed"
am: 66f685a235

Change-Id: I17c065fbf56e68daa1d8909bea914f3ffdca87dd
2017-05-05 01:04:45 +00:00
Adrian Roos
66f685a235 Merge "Update carrier text when phone service state is changed" 2017-05-05 00:50:18 +00:00
Yang Ni
088eca8302 Merge "Destroy Allocation with ScriptIntrinsicLut"
am: 622b140f94

Change-Id: I7d781ce6f36d0205bb35a9b3416e4ea55f4b8eeb
2017-05-04 18:56:34 +00:00
Neil Fuller
68f666693a Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.

The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.

The updater is then required to communicate with the
data app and report back to the system server.

Unit tests are included for the major components.

To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/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"

Test: See above.
Bug: 31008728
Merged-In: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
2017-05-04 19:46:47 +01:00
Yang Ni
622b140f94 Merge "Destroy Allocation with ScriptIntrinsicLut" 2017-05-04 18:44:29 +00:00
Yang Ni
8b8f75a700 Destroy Allocation with ScriptIntrinsicLut
Bug: 28053584

On destroying the intrinsic, destroy its contained Allocation right away.

Test: CTS on x86_64 emulator
Change-Id: I5ca0da33b620c3291b7cafda31a6cc83eb7461a0
2017-05-04 18:44:17 +00:00
Android Build Merger (Role)
6904af3684 Merge "Merge "Moved data retry handler from broadcast to message." am: 19cd7568c6" into stage-aosp-master 2017-05-04 18:20:16 +00:00
Jack Yu
546008f072 Merge "Moved data retry handler from broadcast to message."
am: 19cd7568c6

Change-Id: Ie1d413ba04d3efbd159c43dcff9646d0b6f75a35
2017-05-04 18:19:09 +00:00
Jack Yu
7e61d2a0de Merge "Moved data retry handler from broadcast to message."
am: 19cd7568c6

Change-Id: I8a7c38b4cd6f1307cace357e206a93978e53d4bf
2017-05-04 18:13:24 +00:00
Treehugger Robot
19cd7568c6 Merge "Moved data retry handler from broadcast to message." 2017-05-04 18:04:31 +00:00
Colin Cross
58f94a9526 Convert libhwui to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
Merged-In: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
(cherry picked from commit f629810118)
2017-05-04 10:11:54 -07:00
Jack Yu
ba740f0035 Moved data retry handler from broadcast to message.
The broadcast handler onReceive implmentations should
only handle minimum works. Made this consistent with
other DcTracker broadcast handler.

Test: Manual tests, Telephony sanity tests, and unit tests
bug: 37413302
Merged-In: I4c65b2f7b8aa5674eb7e131d26e404ec390ed19a
Change-Id: I4c65b2f7b8aa5674eb7e131d26e404ec390ed19a
2017-05-04 09:52:17 -07:00
Neil Fuller
9798dc47b1 Merge "More time zone update API classes"
am: c301339498

Change-Id: I23ace2d5102f197ca6d6e22a37b54b43e38753ed
2017-05-04 14:48:21 +00:00
Treehugger Robot
c301339498 Merge "More time zone update API classes" 2017-05-04 14:41:10 +00:00
Neil Fuller
463f3f8cf7 Merge "Time zone update API classes"
am: cfe0c2f1ec

Change-Id: I6442aee1844ec9c6ef1017a4744936252ef45243
2017-05-04 14:01:23 +00:00
Neil Fuller
cfe0c2f1ec Merge "Time zone update API classes" 2017-05-04 13:51:39 +00:00
Neil Fuller
a8889fa7fa More time zone update API classes
This class forms the contract between the updater app
(the app provided by and triggered by the system)
and the data app (the app provided by the OEM to
provide time zone data).

Bug: 31008728
Test: make only, just constants
Change-Id: I687b75954e132884aec962fcf8955f3f38a00b2f
2017-05-04 14:11:09 +01:00
Nicolas Geoffray
f59dd816b1 Merge "Adjust forced dexopt in case of stripped APKs."
am: 5669550a83

Change-Id: I1ca14c8eee35cb3f793b2a004f5bd6f6b8ca6120
2017-05-04 11:34:06 +00:00
Neil Fuller
bede17c216 Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.

This forms the basis of client and system server code to
support time zone updates.

Tests can be run with:

make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
    -w com.android.frameworks.coretests \
    "com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"

Bug: 31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
2017-05-04 12:32:53 +01:00
Nicolas Geoffray
5669550a83 Merge "Adjust forced dexopt in case of stripped APKs." 2017-05-04 11:25:04 +00:00
Nicolas Geoffray
96d12a93ae Adjust forced dexopt in case of stripped APKs.
We cannot compile from scratch for strip APK. So
if getDexOptNeeded returns NotNeeded, pretend there was
a compiler filter change, in order to pick up the vdex file.

bug: 37558732
Test: "adb shell cmd package compile" of a stripped /system apk
Change-Id: I531010e01e44adfa300872c1739c49dab7292317
2017-05-04 10:02:56 +01:00
gaoshang
0f722b529c Merge "fix KeyEvent can't correctly finish when inputmethod time out happend"
am: 36247646e3

Change-Id: I245d63d33fdc7376e05539486be3b31b284ea11f
2017-05-04 03:46:13 +00:00
Treehugger Robot
36247646e3 Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" 2017-05-04 03:37:37 +00:00
gaoshang
d66a86bf50 fix KeyEvent can't correctly finish when inputmethod time out happend
Symptom: If inputmethod handle an KeyEvent time out ,
Did not finish this event correctly , eventually lead to app ANR
Root Cause: without seq number when obtainMessage MSG_TIMEOUT_INPUT_EVENT
Solution: add seq parameter

Test: Input
Test: InputMethod

Fixes: 37648930
Change-Id: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Merged-In: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
2017-05-04 02:19:42 +00:00
Hemant Gupta
799be11e6f Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected"
am: 7485f047ba

Change-Id: I1c222eda83abf4a056535790b48819d857fdd1de
2017-05-03 19:46:41 +00:00