git.osdn.net Git - android-x86/frameworks-base.git/log

Merge "Log the error when uncrypt timeouts"
am: c1973ecbd2

Change-Id: I5bec3110f9a46cbc1f44bc07d86eea409667983e

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 19:42:29 +0000 (19:42 +0000)]

Merge "Log the error when uncrypt timeouts"

commit | commitdiff | tree

Neil Fuller [Wed, 28 Sep 2016 17:50:44 +0000 (17:50 +0000)]

Merge "Rerun of update-api with no changes"
am: f0aa998233

Change-Id: I23a36931c027b29f740879e46d1c28e53b616d71

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 17:41:53 +0000 (17:41 +0000)]

Merge "Rerun of update-api with no changes"

commit | commitdiff | tree

Andreas Huber [Wed, 28 Sep 2016 17:30:23 +0000 (17:30 +0000)]

Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"
am: 90acbd86ac

Change-Id: Ia3013237296ccca46e3f4e0bc702b4ae90a7ea3a

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 17:16:52 +0000 (17:16 +0000)]

Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"

Merge "hwui: Fix the length of partial updates system property"
am: faf945a773

Change-Id: I2f98f29446c9a303e72f0ff6a3ddd2612e369c0a

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 16:47:02 +0000 (16:47 +0000)]

Merge "hwui: Fix the length of partial updates system property"

Merge "fix persistent process is killed and restart again and again"
am: ae302cef52

Change-Id: I31ead1fe09561e69df0cd94f366b2ef4648b29f3

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 16:20:55 +0000 (16:20 +0000)]

Merge "fix persistent process is killed and restart again and again"

commit | commitdiff | tree

Neil Fuller [Wed, 28 Sep 2016 15:51:03 +0000 (16:51 +0100)]

Rerun of update-api with no changes

Picks up a small change to Parameter.

Looks like it was caused by a mid-air collision between
commit 3ead539c0129e6dd82df301e2652f1c0524a3b82, which
introduced Parameter, and commit
b4fcc6136e25d46af460d4cb99b8f5f279bfb5db which
introduced improvements to generics in the .txt file.

Test: make droid
Change-Id: If1c11e9303d17854ab1e5559c9a412cc6de54685

Merge "[NAN] Use a hidden class for peer ID opaque handle"
am: e43c1a3e3e

Change-Id: Iac94c4b27f7bfc89c1b1f7779760512ee2a11e31

Merge "[NAN] Use a hidden class for peer ID opaque handle"

Merge changes from topic 'libandroid-ndk_headers'
am: 00a19a37db

Change-Id: I0cabe907b999e5ea14ec1ff3cebb739b99b6a764

Move libjnigraphics to ndk_library.
am: 7ce8df32a7

Change-Id: I1eb9e19b6a270a9b24bdff9a5a86a06a1a8d197f

Migrate libandroid.so to ndk_library.
am: 2a8d9c20bd

Change-Id: Iaa9b5929b542307e5c95f1e7fe1d4d275189e683

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 03:32:56 +0000 (03:32 +0000)]

Merge changes from topic 'libandroid-ndk_headers'

* changes:
Move libjnigraphics to ndk_library.
Migrate libandroid.so to ndk_library.

[NAN] Use a hidden class for peer ID opaque handle

Results in clearer run-time exception (relatively to using Integer).

(cherry-pick of commit 57db2b3eea5333e5ee144ea29e4a4af02fae7309)

Bug: 31689166
Test: unit-tests + integrated (sl4a).
Change-Id: I79d0e8061204834b9775b02d503cb18fd03ed8c6

Merge "Add key to CarrierConfig"
am: 154c22d2d4

Change-Id: I5355f13efb084c0785bcce60ef327dc4bc436fe2

Merge "Add key to CarrierConfig"

Move libjnigraphics to ndk_library.

The headers are already migrated because they're in
frameworks/native/include/android, which was covered when migrating
libandroid.

Test: make native
Bug: http://b/30465923
Change-Id: I610dc6c613f2a408960088a86629073da38682a0

Migrate libandroid.so to ndk_library.

Test: make native
Bug: http://b/30465923
Change-Id: I956b5014c4da4dce1ce28da706b9d868eba4cce3

Log the error when uncrypt timeouts

Log the error code to uncrypt_status if uncrypt gets killed because
of timeout.

Test: We log the error code correctly in uncrypt_status when uncrypt timeouts.
Bug: 31603820
Change-Id: Ia623c333714295e68f4269257fbb4297a867e42b

Merge "[NAN] Rename setTerminateNotificationEnabled per API review"
am: 5d74bf9f95

Change-Id: I435c5377d7897cee20bba7a352eb55e85e996673

Merge "[NAN] Rename setTerminateNotificationEnabled per API review"

commit | commitdiff | tree

Andreas Huber [Fri, 23 Sep 2016 01:14:17 +0000 (18:14 -0700)]

Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)

that convert a one-dimensional array of scalars into the corresponding
one-dimensional array of the associated "wrapped" type, i.e. byte[] -> Byte[].

Change-Id: I712b2bb5330bd660816d0ff536a55913904203b6
Bug: 31682327
Test: hidl_test_java

[NAN] Rename setTerminateNotificationEnabled per API review

(cherry-pick of commit 7df9b7a1039ea8e34e82e650cebd1025a2591580)

Bug: 31470256
Test: unit tests + integrated (sl4a) tests
Change-Id: I1554b5b7961a5c46656a40ad395431125da7aa7f

commit | commitdiff | tree

Tobias Thierer [Tue, 27 Sep 2016 14:11:45 +0000 (14:11 +0000)]

Merge "API: Update ResourceBundle to OpenJDK8u60"
am: 9d16a441a6

Change-Id: I90e0bb992f002718c5f509c226fdc0d57e651aff

commit | commitdiff | tree

Tobias Thierer [Tue, 27 Sep 2016 14:03:44 +0000 (14:03 +0000)]

Merge "API: Update ResourceBundle to OpenJDK8u60"

commit | commitdiff | tree

Christopher Wiley [Tue, 27 Sep 2016 13:27:57 +0000 (13:27 +0000)]

Merge "Implement untetherAll as calls to stopTethering"
am: 7fd48d54de

Change-Id: I35eda039f92836a9216bfed93b8fc2c39a434a3c

commit | commitdiff | tree

Christopher Wiley [Tue, 27 Sep 2016 13:27:05 +0000 (13:27 +0000)]

Merge "Notify NetworkPolicyManagerService on tethering changes"
am: 4062bec04e

Change-Id: I0b0a15c94a4cb0475fc29ed3bcbf58ed2d6f00be

commit | commitdiff | tree

Treehugger Robot [Tue, 27 Sep 2016 13:18:53 +0000 (13:18 +0000)]

Merge "Implement untetherAll as calls to stopTethering"

commit | commitdiff | tree

Treehugger Robot [Tue, 27 Sep 2016 13:18:37 +0000 (13:18 +0000)]

Merge "Notify NetworkPolicyManagerService on tethering changes"

Merge "[NAN] Fix javadoc links"
am: 4ad6291b08

Change-Id: Ie9d5b4826636488cfa6f41997443a08537895cdc

Merge "[NAN] Fix javadoc links"

Merge "[NAN] Fix incorrect log message"
am: fe0f393116

Change-Id: Ibfc65886bca7dbddf456cfe494b8ee5d3ea74295

[NAN] Fix javadoc links

(cherry-pick of commit ee3d9fc5e60ce4b57dbba7483ac323ed29df2e4a)

Bug: 31470256
Test: builds (javadoc only)
Change-Id: I645525660b9a6759f968d9e62cd79d6a851815bf

Merge "[NAN] Fix incorrect log message"

hwui: Fix the length of partial updates system property

The maximum length of a system property is 31 bytes.
debug.hwui.enable_partial_updates is 33 bytes

Change-Id: Idb1b1a00294dd29f84530e8aee1f685094d0096f

Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review"
am: 88da460cd8

Change-Id: I9debe0bec7569a9acb83d431fc5863b5b9bb5690

[NAN] Fix incorrect log message

(cherry-pick of commit 0d7863406b1542c3092fa976cfb41b09a97dd8bd)

Bug: 31678708
Test: integrated (sl4a) test
Change-Id: I822c66619642f08d1d8f68cc8257185360da60be

Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review"

[NAN] Replace int peerId with more opaqure Object peerHandle per API review

(cherry-pick of commit f02ae5e23cb59fcbd364907ecb1199424fc5eb62)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I0225027b8e1a2d7cb5d27afc91b97ef9643f5dff

Merge "[NAN] Change Broadcast for NAN status change to notification only"
am: e1513a8cc6

Change-Id: I71c367bdeb395e330d57252bc77c9817e8870fb5

Merge "[NAN] Change Broadcast for NAN status change to notification only"

Merge "[NAN] Remove failure reason codes from API per API review"
am: a7b2fff388

Change-Id: I2d16cebc4357a88ba44a7e209a1ddb8718516c4f

[NAN] Change Broadcast for NAN status change to notification only

Remove information about current status of NAN. Receiver will have
to query that information explicitly. New pattern (per API council
review) - helps reduce window for having old information.

(cherry-pick of commit 905077a590d5b63a262d6f1f4f6e555ad9b79359)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: If3d0873989389e6c69feb0d02e5d0c79cdf9679e

Merge "[NAN] Remove failure reason codes from API per API review"

commit | commitdiff | tree

Michael Wright [Mon, 26 Sep 2016 14:19:45 +0000 (14:19 +0000)]

Merge changes from topic 'aosp-generics-api'
am: fe9357f6e7

Change-Id: Ifff5983e6c85faefa91e8ec5de4221cc715c575c

commit | commitdiff | tree

Michael Wright [Mon, 26 Sep 2016 14:14:22 +0000 (14:14 +0000)]

DO NOT MERGE Track generics in API definition.
am: b4fcc6136e -s ours

Change-Id: Iada343936c04f2a7f3875f86c1f8c48c5a62be2b

commit | commitdiff | tree

Dianne Hackborn [Mon, 26 Sep 2016 14:13:44 +0000 (14:13 +0000)]

DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
am: a0e55c43c2 -s ours

Change-Id: I15b1ff09f6c346001e89c06b45b91e92adbceae8

commit | commitdiff | tree

Treehugger Robot [Mon, 26 Sep 2016 14:04:56 +0000 (14:04 +0000)]

Merge changes from topic 'aosp-generics-api'

* changes:
DO NOT MERGE Track generics in API definition.
DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API

Merge "[NAN] Reorder parameters of send message method(s) per API review"
am: 1dd012a41a

Change-Id: I6b32b5fde71753bed0a16250065551dc3f218f54

[NAN] Remove failure reason codes from API per API review

Not all codes are actionable. Will add back if/as needed.

(cherry-pick of commit 4b47c3f5b869a5fb072b122c47bf2c9e87f582e9)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: Ibfc9df4dbd3b569caf4ade1da9d2ef43d99269a8

Merge "[NAN] Reorder parameters of send message method(s) per API review"

commit | commitdiff | tree

Narayan Kamath [Mon, 26 Sep 2016 10:02:48 +0000 (10:02 +0000)]

Merge "Remove (now) unnecessary reference to core-lambda-stubs."
am: 68e91852c3

Change-Id: I43ac61098a1dd8986385d61b702459c63e640c73

commit | commitdiff | tree

Treehugger Robot [Mon, 26 Sep 2016 09:55:36 +0000 (09:55 +0000)]

Merge "Remove (now) unnecessary reference to core-lambda-stubs."

Merge "[NAN] Add Handler to publish/subscribe per API review"
am: 95abef9355

Change-Id: I31f34ec26776ae7168128c47cda0fc29d08c7753

[NAN] Reorder parameters of send message method(s) per API review

Move messageId before message in the argument list.

(cherry-pick of commit 3da7c88425d826e1a5e662f3d8671900e2ad15e5)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I6bfd673a0f92d9908c5b837b713120927b1a0123

Merge "[NAN] Add Handler to publish/subscribe per API review"

commit | commitdiff | tree

Dimitry Ivanov [Sat, 24 Sep 2016 22:14:48 +0000 (22:14 +0000)]

Merge "Add missing liblog dependency"
am: 6a7c807d65

Change-Id: Ia590e4b12de01da9a288cda8dfe730a82c319648

commit | commitdiff | tree

Dimitry Ivanov [Sat, 24 Sep 2016 22:07:37 +0000 (22:07 +0000)]

Merge "Add missing liblog dependency"

commit | commitdiff | tree

Dimitry Ivanov [Sat, 24 Sep 2016 00:20:32 +0000 (17:20 -0700)]

Add missing liblog dependency

Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and recompile
Change-Id: I71f402a04686b7bd6ee6adacda7b51280f5c7b92

[NAN] Add Handler to publish/subscribe per API review

All callback registrations must have handlers.

(cherry-pick of commit 9b04fd2475f5ebecb81e75a8272cf410ba3f5854)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I5ecc04f997e45b76710f526f378e4cf6e0e28fb9

commit | commitdiff | tree

Gopal Krishna Shukla [Fri, 23 Sep 2016 13:07:52 +0000 (13:07 +0000)]

Merge "Provide synchronization to setview to avoid NPE"
am: b05b93a674

Change-Id: I92bec8af349cae5232e65d88938635a93f06fc6a

commit | commitdiff | tree

Treehugger Robot [Fri, 23 Sep 2016 12:57:57 +0000 (12:57 +0000)]

Merge "Provide synchronization to setview to avoid NPE"

Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
am: bc3d106b97

Change-Id: I1019b5c514424043144351aa893b4f5048e4207e

Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."

commit | commitdiff | tree

Christopher Wiley [Thu, 22 Sep 2016 23:52:02 +0000 (23:52 +0000)]

Merge changes from topic 'remove-set-frequency-band'
am: 430904a4ab

Change-Id: Iadf94f5e95f9a53c03115a44594f32aba21ecb4f

commit | commitdiff | tree

Christopher Wiley [Thu, 22 Sep 2016 23:51:57 +0000 (23:51 +0000)]

Remove ability to set frequency from WifiAssociationTest
am: 93ce63760d

Change-Id: I334fde9e45a6ca6bba6e6a2ec5d9f68f52e31e03

commit | commitdiff | tree

Christopher Wiley [Thu, 22 Sep 2016 23:50:58 +0000 (23:50 +0000)]

Remove WifiManager#get/setFrequencyBand
am: 79ec1736be

Change-Id: I9b5b298fc3e47e77a59701e7f9d4dc18680f12b8

commit | commitdiff | tree

Christopher Wiley [Thu, 22 Sep 2016 23:34:17 +0000 (23:34 +0000)]

Merge changes from topic 'remove-set-frequency-band'

* changes:
Remove ability to set frequency from WifiAssociationTest
Remove WifiManager#get/setFrequencyBand

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 22 Sep 2016 22:39:31 +0000 (22:39 +0000)]

Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
am: 3b0256fc73

Change-Id: If33f7f2787ee94609e9fbb0ea52f66bdbdf57614

commit | commitdiff | tree

Treehugger Robot [Thu, 22 Sep 2016 21:56:09 +0000 (21:56 +0000)]

Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"

commit | commitdiff | tree

Colin Cross [Thu, 22 Sep 2016 21:55:27 +0000 (21:55 +0000)]

Merge "aapt: remove duplicate definition of ZD"
am: ac2d839d7c

Change-Id: I7f2388c9f0cd649ef79db41c67a4f07cbb18a3c9

commit | commitdiff | tree

Treehugger Robot [Thu, 22 Sep 2016 21:24:46 +0000 (21:24 +0000)]

Merge "aapt: remove duplicate definition of ZD"

Merge "Skip uninstalled package for getPackagesForUid()"
am: f4c8c3590a

Change-Id: I1e4f7913cc00635611440faabcab4faff7f35dc5

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 22 Sep 2016 00:28:11 +0000 (17:28 -0700)]

Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind

Add a missing call to remove all MESSAGE_BIND_PROFILE_SERVICE
message when unbinding and finishing.

Bug: 31442739
Test: manual, and "frameworks/base/core/tests/bluetoothtests" unit tests
Change-Id: I7e9a8f79a38d4eb8ab8b53be04650226fc72732e

commit | commitdiff | tree

Treehugger Robot [Thu, 22 Sep 2016 20:00:01 +0000 (20:00 +0000)]

Merge "Skip uninstalled package for getPackagesForUid()"

commit | commitdiff | tree

Colin Cross [Thu, 22 Sep 2016 19:59:13 +0000 (19:59 +0000)]

Merge "Remove has_trivial_move trait from StringPool types"
am: d333f28397

Change-Id: I6d606897a3edeb01425748105efeb86a43719226

commit | commitdiff | tree

Colin Cross [Thu, 22 Sep 2016 19:44:27 +0000 (19:44 +0000)]

Merge "Remove has_trivial_move trait from StringPool types"

Merge "[ActivityManager] Reset killed flag at attachApplicationLocked"
am: 1d5447d70b

Change-Id: Id51a6dabbf1fec793ca0a905454a412359e0cd57

commit | commitdiff | tree

Colin Cross [Thu, 22 Sep 2016 17:09:38 +0000 (10:09 -0700)]

Remove has_trivial_move trait from StringPool types

StringPool:entry* are not trivially moveable, as they contain Vector<>
objects. The data in Vector<> is trivially moveable, but Vector<>
itself is a dynamic type with a vtable, which is not trivially
moveable.

Impact on aapt for frameworks-res is negligible, ~3%.

Bug: 31595853
Test: m -j framework-res
Change-Id: I562a46ef8934aed7aab5c5377db53d9cf64a08b9

Skip uninstalled package for getPackagesForUid()

If a package with sharedUserId had been setInstalled
with false, then the result of getPackagesForUid()
should not include it.

https://code.google.com/p/android/issues/detail?id=212255

Change-Id: I7b984051db34ecc2d0ef9518786d51100ab9ac79
Signed-off-by: liulvping <liulvping@xiaomi.com>

commit | commitdiff | tree

Narayan Kamath [Thu, 22 Sep 2016 16:50:23 +0000 (17:50 +0100)]

Remove (now) unnecessary reference to core-lambda-stubs.

Tis now included in core-oj.

bug: 31675876
Test: make checkbuild
Change-Id: If9062a55ec02fe653542dcb4a41020c8e1f6f15e

commit | commitdiff | tree

Treehugger Robot [Thu, 22 Sep 2016 14:54:16 +0000 (14:54 +0000)]

Merge "[ActivityManager] Reset killed flag at attachApplicationLocked"

[ActivityManager] Reset killed flag at attachApplicationLocked

A restarted process will reuse original process record.
If only reset KilledByAm flag, not reset Killed flag.
When app process have been killed by AMS can skip unnessary ANR,
but not catch lowmemorykiller in AppErrors.appNotResponding()

Change-Id: Ie4653edf4252797eaeefbf9a4a35ac00cfa857d8
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 08:09:21 +0000 (08:09 +0000)]

Merge "Remove net_bt_stack group and replace it with bluetooth"
am: 2309b98b25

Change-Id: Ib2704e71c9d32a5799b44d1753bf3011607787c8

Merge "[NAN] Method renames based on API council feedback"
am: dcac00f325

Change-Id: I1eaa81952e2826f25de9e3e9f4edfa23db368f5a

commit | commitdiff | tree

Gopal Krishna Shukla [Wed, 6 Jul 2016 02:44:59 +0000 (08:14 +0530)]

Provide synchronization to setview to avoid NPE

If setView() will be called from two different threads
then mView property of a View object may have inconsistent
value. For instance, setView() may set mView to null causing
NullPointerException. Synchronize root.setView() as well to
avoid this.

Change-Id: I5f9cf47ece5d4aca575bd8644ecfcee0ed43d843

commit | commitdiff | tree

Ajay Panicker [Thu, 22 Sep 2016 01:32:33 +0000 (01:32 +0000)]

Merge "Remove net_bt_stack group and replace it with bluetooth"

[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks.

Provide separate mechanism to attach with a request for identity
change listener.

(cherry-pick of commit 78e33f277eff5183f4525ce2a699acf2ad848177)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I26b3bf4e904f3c3822578185fa55e2de5e63b71b

Merge "[NAN] Method renames based on API council feedback"

commit | commitdiff | tree

Greg Hackmann [Wed, 21 Sep 2016 21:15:30 +0000 (21:15 +0000)]

Merge changes Iaa153fca,I619e2d8a
am: 59acc059a6

Change-Id: Ic657c33aa5fd728d0e5a8fc3c6c23c0fff420844

commit | commitdiff | tree

Greg Hackmann [Wed, 21 Sep 2016 21:15:13 +0000 (21:15 +0000)]

AlarmManagerService: explain some timerfd_create() failures
am: a0126e0857

Change-Id: I7c9e394d2edcca81e757e351f9de25447b33c2f4

commit | commitdiff | tree

Greg Hackmann [Wed, 21 Sep 2016 21:13:56 +0000 (21:13 +0000)]

AlarmManagerService: remove legacy /dev/alarm support
am: d7151c06f1

Change-Id: Ibefee7970e426f69e62b9f31fb7a38d24ad63c2a

commit | commitdiff | tree

Greg Hackmann [Wed, 21 Sep 2016 21:04:09 +0000 (21:04 +0000)]

Merge changes Iaa153fca,I619e2d8a

* changes:
AlarmManagerService: explain some timerfd_create() failures
AlarmManagerService: remove legacy /dev/alarm support

commit | commitdiff | tree

Andre Eisenbach [Wed, 21 Sep 2016 20:51:07 +0000 (20:51 +0000)]

Merge "List btopp.intent.action.ACCEPT broadcast as protected"
am: e2d9cc4bc9

Change-Id: I7e83f318b9a8ab0520d4df66d9faa96e768df612

[NAN] Method renames based on API council feedback

- Fix tenses throughout
- connect -> attach
- disconnect/terminate -> destroy
- IsUsable -> IsAvailable

Note: pure rename operation - no functional changes

(cherry-pick of commit 34a0342ab515762f3fc594ffbc4784e56e79ccbf)

Bug: 31470256
Test: unit tests + integration (sl4a) test
Change-Id: I0f275c590c63109b7196622cfc5001082e3eb5a2

commit | commitdiff | tree

Andre Eisenbach [Wed, 21 Sep 2016 20:38:31 +0000 (20:38 +0000)]