OSDN Git Service

android-x86/frameworks-base.git
7 years agoPackage Manager: Sort list of packages to dexopt
Andreas Gampe [Thu, 29 Sep 2016 00:16:22 +0000 (00:16 +0000)]
Package Manager: Sort list of packages to dexopt
am: 71ea678683

Change-Id: Ie8ecafe5604dddde32cf7334d0dfa92060994b69

7 years agoMerge "Remove dial_string_replace configs"
Jordan Liu [Thu, 29 Sep 2016 00:15:23 +0000 (00:15 +0000)]
Merge "Remove dial_string_replace configs"
am: c95c2344b5

Change-Id: I74902917220aaa287472867e69cabdc488f517eb

7 years agoMerge "Add dial_string_replace key to CarrierConfig"
Jordan Liu [Thu, 29 Sep 2016 00:09:08 +0000 (00:09 +0000)]
Merge "Add dial_string_replace key to CarrierConfig"
am: 715903f3c6

Change-Id: Ia54f61dccce81147b42c87691d0f49d5e78dead4

7 years agoMerge "Remove dial_string_replace configs"
Jordan Liu [Wed, 28 Sep 2016 23:59:20 +0000 (23:59 +0000)]
Merge "Remove dial_string_replace configs"

7 years agoMerge "Add dial_string_replace key to CarrierConfig"
Jordan Liu [Wed, 28 Sep 2016 23:58:34 +0000 (23:58 +0000)]
Merge "Add dial_string_replace key to CarrierConfig"

7 years agoMerge "wifi: add test target/directory for unit testing WiFi framework APIs"
Peter Qiu [Wed, 28 Sep 2016 23:05:23 +0000 (23:05 +0000)]
Merge "wifi: add test target/directory for unit testing WiFi framework APIs"
am: afbe615993

Change-Id: I0f957b629174a0880bec51d33ac8e133c7d6096c

7 years agoMerge "wifi: add test target/directory for unit testing WiFi framework APIs"
Treehugger Robot [Wed, 28 Sep 2016 22:52:30 +0000 (22:52 +0000)]
Merge "wifi: add test target/directory for unit testing WiFi framework APIs"

7 years agoMerge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master
TreeHugger Robot [Wed, 28 Sep 2016 21:47:50 +0000 (21:47 +0000)]
Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master

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

7 years agoPackage Manager: Sort list of packages to dexopt
Andreas Gampe [Wed, 7 Sep 2016 01:22:19 +0000 (18:22 -0700)]
Package Manager: Sort list of packages to dexopt

Sort the list by last-use-time, if available. Interleave the
dependencies with the packages.

Clean up the code a bit for better code reuse and ease of writing
filters.

This should help with prioritization under space constraints.

Bug: 31347757
Change-Id: Ia0ec62faf013a379dc4c80b18fd6b2bfbfa470c4
(cherry picked from commit d3e07d46d41e8411def67c2150a0bae064e900dc)

7 years agoMerge "[NAN] Remove builder API using String to translate to byte[]"
Etan Cohen [Wed, 28 Sep 2016 20:32:08 +0000 (20:32 +0000)]
Merge "[NAN] Remove builder API using String to translate to byte[]"
am: 1bca5ad210

Change-Id: Ia08fe939499fa8f9a09958ce28cef9676d442600

7 years agoDO NOT MERGE Track generics in API definition.
Kenny Root [Wed, 28 Sep 2016 20:29:03 +0000 (13:29 -0700)]
DO NOT MERGE Track generics in API definition.

Bug: 24265043
Change-Id: I29a1f1c2011f967360506148e4e8cbdd605f1333

7 years agoMerge "[NAN] Remove builder API using String to translate to byte[]"
Etan Cohen [Wed, 28 Sep 2016 20:25:01 +0000 (20:25 +0000)]
Merge "[NAN] Remove builder API using String to translate to byte[]"

7 years agoDO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
Dianne Hackborn [Wed, 29 Jun 2016 18:48:14 +0000 (11:48 -0700)]
DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API

(cherry picked from commit a0e55c43c235fca37028f0988bbb11ea0f160858)

Change-Id: I415d7ddfc703111998688da71ec6c8f1e5d6d6fc

7 years agoMerge "Log the error when uncrypt timeouts"
Tianjie Xu [Wed, 28 Sep 2016 19:53:37 +0000 (19:53 +0000)]
Merge "Log the error when uncrypt timeouts"
am: c1973ecbd2

Change-Id: I5bec3110f9a46cbc1f44bc07d86eea409667983e

7 years agoMerge "Log the error when uncrypt timeouts"
Treehugger Robot [Wed, 28 Sep 2016 19:42:29 +0000 (19:42 +0000)]
Merge "Log the error when uncrypt timeouts"

7 years ago[NAN] Remove builder API using String to translate to byte[]
Etan Cohen [Tue, 27 Sep 2016 19:23:51 +0000 (12:23 -0700)]
[NAN] Remove builder API using String to translate to byte[]

Per API review: String accessor was not needed (duplicate, semantics
not accurate, trivial use-case).

(cherry-pick of commit c76ccf3e7e673fb21f27ea8e7482021900b113cf)

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

7 years agoMerge "Rerun of update-api with no changes"
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

7 years agoMerge "Rerun of update-api with no changes"
Treehugger Robot [Wed, 28 Sep 2016 17:41:53 +0000 (17:41 +0000)]
Merge "Rerun of update-api with no changes"

7 years agoMerge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"
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

7 years agoMerge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"
Treehugger Robot [Wed, 28 Sep 2016 17:16:52 +0000 (17:16 +0000)]
Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"

7 years agoMerge "hwui: Fix the length of partial updates system property"
ryang [Wed, 28 Sep 2016 16:58:57 +0000 (16:58 +0000)]
Merge "hwui: Fix the length of partial updates system property"
am: faf945a773

Change-Id: I2f98f29446c9a303e72f0ff6a3ddd2612e369c0a

7 years agoMerge "hwui: Fix the length of partial updates system property"
Treehugger Robot [Wed, 28 Sep 2016 16:47:02 +0000 (16:47 +0000)]
Merge "hwui: Fix the length of partial updates system property"

7 years agoMerge "fix persistent process is killed and restart again and again"
yuanhuihui [Wed, 28 Sep 2016 16:30:25 +0000 (16:30 +0000)]
Merge "fix persistent process is killed and restart again and again"
am: ae302cef52

Change-Id: I31ead1fe09561e69df0cd94f366b2ef4648b29f3

7 years agoMerge "fix persistent process is killed and restart again and again"
Treehugger Robot [Wed, 28 Sep 2016 16:20:55 +0000 (16:20 +0000)]
Merge "fix persistent process is killed and restart again and again"

7 years agoRerun of update-api with no changes
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

7 years agoMerge "[NAN] Use a hidden class for peer ID opaque handle"
Etan Cohen [Wed, 28 Sep 2016 05:14:30 +0000 (05:14 +0000)]
Merge "[NAN] Use a hidden class for peer ID opaque handle"
am: e43c1a3e3e

Change-Id: Iac94c4b27f7bfc89c1b1f7779760512ee2a11e31

7 years agoMerge "[NAN] Use a hidden class for peer ID opaque handle"
Etan Cohen [Wed, 28 Sep 2016 05:04:06 +0000 (05:04 +0000)]
Merge "[NAN] Use a hidden class for peer ID opaque handle"

7 years agoMerge changes from topic 'libandroid-ndk_headers'
Dan Albert [Wed, 28 Sep 2016 03:48:17 +0000 (03:48 +0000)]
Merge changes from topic 'libandroid-ndk_headers'
am: 00a19a37db

Change-Id: I0cabe907b999e5ea14ec1ff3cebb739b99b6a764

7 years agoMove libjnigraphics to ndk_library.
Dan Albert [Wed, 28 Sep 2016 03:39:23 +0000 (03:39 +0000)]
Move libjnigraphics to ndk_library.
am: 7ce8df32a7

Change-Id: I1eb9e19b6a270a9b24bdff9a5a86a06a1a8d197f

7 years agoMigrate libandroid.so to ndk_library.
Dan Albert [Wed, 28 Sep 2016 03:38:22 +0000 (03:38 +0000)]
Migrate libandroid.so to ndk_library.
am: 2a8d9c20bd

Change-Id: Iaa9b5929b542307e5c95f1e7fe1d4d275189e683

7 years agoMerge changes from topic 'libandroid-ndk_headers'
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.

7 years ago[NAN] Use a hidden class for peer ID opaque handle
Etan Cohen [Tue, 27 Sep 2016 16:15:46 +0000 (09:15 -0700)]
[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

7 years agoAdd dial_string_replace key to CarrierConfig
Jordan Liu [Fri, 9 Sep 2016 18:48:48 +0000 (11:48 -0700)]
Add dial_string_replace key to CarrierConfig

Add KEY_DIAL_STRING_REPLACE_STRING_ARRAY and default value (null) to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

This value exists to fix http://b/17202092. We specify a map from
dialstrings to replacements for roaming network service numbers which
cannot be replaced on the carrier side.

Merged-In: I852261596d3931f38d5f1c6b3d24ffe27f950458

Bug: 29873049
Change-Id: I99d97bb25ef57c178d004ae17d97a6c7672734e2

7 years agoMerge "Add key to CarrierConfig"
Jordan Liu [Tue, 27 Sep 2016 22:24:23 +0000 (22:24 +0000)]
Merge "Add key to CarrierConfig"
am: 154c22d2d4

Change-Id: I5355f13efb084c0785bcce60ef327dc4bc436fe2

7 years agoMerge "Add key to CarrierConfig"
Jordan Liu [Tue, 27 Sep 2016 22:19:26 +0000 (22:19 +0000)]
Merge "Add key to CarrierConfig"

7 years agowifi: add test target/directory for unit testing WiFi framework APIs
Peter Qiu [Mon, 26 Sep 2016 20:14:13 +0000 (13:14 -0700)]
wifi: add test target/directory for unit testing WiFi framework APIs

The existing tests for the WiFi frameworks API android.net.wifi are
copied from frameworks/opt/wifi/tests, and will be removed in
frameworks/opt/wifi/tests.

Bug: 31745421
Change-Id: I789e983bc7dd02b6c3fa6a982ca671347912be0f
Test: frameworks/base/wifi/runtests.sh

7 years agoMove libjnigraphics to ndk_library.
Dan Albert [Fri, 23 Sep 2016 23:43:49 +0000 (16:43 -0700)]
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

7 years agoMigrate libandroid.so to ndk_library.
Dan Albert [Fri, 23 Sep 2016 22:55:49 +0000 (15:55 -0700)]
Migrate libandroid.so to ndk_library.

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

7 years agoLog the error when uncrypt timeouts
Tianjie Xu [Sat, 24 Sep 2016 22:39:56 +0000 (15:39 -0700)]
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

7 years agoMerge "[NAN] Rename setTerminateNotificationEnabled per API review"
Etan Cohen [Tue, 27 Sep 2016 20:02:00 +0000 (20:02 +0000)]
Merge "[NAN] Rename setTerminateNotificationEnabled per API review"
am: 5d74bf9f95

Change-Id: I435c5377d7897cee20bba7a352eb55e85e996673

7 years agoMerge "[NAN] Rename setTerminateNotificationEnabled per API review"
Etan Cohen [Tue, 27 Sep 2016 19:50:43 +0000 (19:50 +0000)]
Merge "[NAN] Rename setTerminateNotificationEnabled per API review"

7 years agoAdds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)
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

7 years ago[NAN] Rename setTerminateNotificationEnabled per API review
Etan Cohen [Tue, 27 Sep 2016 16:51:37 +0000 (09:51 -0700)]
[NAN] Rename setTerminateNotificationEnabled per API review

(cherry-pick of commit 7df9b7a1039ea8e34e82e650cebd1025a2591580)

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

7 years agoMerge "API: Update ResourceBundle to OpenJDK8u60"
Tobias Thierer [Tue, 27 Sep 2016 14:11:45 +0000 (14:11 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60"
am: 9d16a441a6

Change-Id: I90e0bb992f002718c5f509c226fdc0d57e651aff

7 years agoMerge "API: Update ResourceBundle to OpenJDK8u60"
Tobias Thierer [Tue, 27 Sep 2016 14:03:44 +0000 (14:03 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60"

7 years agoMerge "Implement untetherAll as calls to stopTethering"
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

7 years agoMerge "Notify NetworkPolicyManagerService on tethering changes"
Christopher Wiley [Tue, 27 Sep 2016 13:27:05 +0000 (13:27 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes"
am: 4062bec04e

Change-Id: I0b0a15c94a4cb0475fc29ed3bcbf58ed2d6f00be

7 years agoMerge "Implement untetherAll as calls to stopTethering"
Treehugger Robot [Tue, 27 Sep 2016 13:18:53 +0000 (13:18 +0000)]
Merge "Implement untetherAll as calls to stopTethering"

7 years agoMerge "Notify NetworkPolicyManagerService on tethering changes"
Treehugger Robot [Tue, 27 Sep 2016 13:18:37 +0000 (13:18 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes"

7 years agoMerge "[NAN] Fix javadoc links"
Etan Cohen [Mon, 26 Sep 2016 23:02:29 +0000 (23:02 +0000)]
Merge "[NAN] Fix javadoc links"
am: 4ad6291b08

Change-Id: Ie9d5b4826636488cfa6f41997443a08537895cdc

7 years agoMerge "[NAN] Fix javadoc links"
Etan Cohen [Mon, 26 Sep 2016 22:53:16 +0000 (22:53 +0000)]
Merge "[NAN] Fix javadoc links"

7 years agoMerge "[NAN] Fix incorrect log message"
Etan Cohen [Mon, 26 Sep 2016 20:58:07 +0000 (20:58 +0000)]
Merge "[NAN] Fix incorrect log message"
am: fe0f393116

Change-Id: Ibfc65886bca7dbddf456cfe494b8ee5d3ea74295

7 years ago[NAN] Fix javadoc links
Etan Cohen [Thu, 22 Sep 2016 19:37:17 +0000 (12:37 -0700)]
[NAN] Fix javadoc links

(cherry-pick of commit ee3d9fc5e60ce4b57dbba7483ac323ed29df2e4a)

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

7 years agoMerge "[NAN] Fix incorrect log message"
Etan Cohen [Mon, 26 Sep 2016 20:48:52 +0000 (20:48 +0000)]
Merge "[NAN] Fix incorrect log message"

7 years agohwui: Fix the length of partial updates system property
ryang [Mon, 26 Sep 2016 19:57:38 +0000 (15:57 -0400)]
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

7 years agoMerge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review"
Etan Cohen [Mon, 26 Sep 2016 18:56:16 +0000 (18:56 +0000)]
Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review"
am: 88da460cd8

Change-Id: I9debe0bec7569a9acb83d431fc5863b5b9bb5690

7 years ago[NAN] Fix incorrect log message
Etan Cohen [Thu, 22 Sep 2016 18:00:57 +0000 (11:00 -0700)]
[NAN] Fix incorrect log message

(cherry-pick of commit 0d7863406b1542c3092fa976cfb41b09a97dd8bd)

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

7 years agoMerge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review"
Etan Cohen [Mon, 26 Sep 2016 18:50:35 +0000 (18:50 +0000)]
Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review"

7 years ago[NAN] Replace int peerId with more opaqure Object peerHandle per API review
Etan Cohen [Thu, 22 Sep 2016 15:18:36 +0000 (08:18 -0700)]
[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

7 years agoMerge "[NAN] Change Broadcast for NAN status change to notification only"
Etan Cohen [Mon, 26 Sep 2016 16:48:39 +0000 (16:48 +0000)]
Merge "[NAN] Change Broadcast for NAN status change to notification only"
am: e1513a8cc6

Change-Id: I71c367bdeb395e330d57252bc77c9817e8870fb5

7 years agoMerge "[NAN] Change Broadcast for NAN status change to notification only"
Etan Cohen [Mon, 26 Sep 2016 16:40:52 +0000 (16:40 +0000)]
Merge "[NAN] Change Broadcast for NAN status change to notification only"

7 years agoMerge "[NAN] Remove failure reason codes from API per API review"
Etan Cohen [Mon, 26 Sep 2016 14:58:37 +0000 (14:58 +0000)]
Merge "[NAN] Remove failure reason codes from API per API review"
am: a7b2fff388

Change-Id: I2d16cebc4357a88ba44a7e209a1ddb8718516c4f

7 years ago[NAN] Change Broadcast for NAN status change to notification only
Etan Cohen [Thu, 22 Sep 2016 00:54:35 +0000 (17:54 -0700)]
[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

7 years agoMerge "[NAN] Remove failure reason codes from API per API review"
Etan Cohen [Mon, 26 Sep 2016 14:48:48 +0000 (14:48 +0000)]
Merge "[NAN] Remove failure reason codes from API per API review"

7 years agoMerge changes from topic 'aosp-generics-api'
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

7 years agoDO NOT MERGE Track generics in API definition.
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

7 years agoDO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
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

7 years agoMerge changes from topic 'aosp-generics-api'
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

7 years agoMerge "[NAN] Reorder parameters of send message method(s) per API review"
Etan Cohen [Mon, 26 Sep 2016 13:06:05 +0000 (13:06 +0000)]
Merge "[NAN] Reorder parameters of send message method(s) per API review"
am: 1dd012a41a

Change-Id: I6b32b5fde71753bed0a16250065551dc3f218f54

7 years ago[NAN] Remove failure reason codes from API per API review
Etan Cohen [Wed, 21 Sep 2016 21:37:02 +0000 (14:37 -0700)]
[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

7 years agoMerge "[NAN] Reorder parameters of send message method(s) per API review"
Etan Cohen [Mon, 26 Sep 2016 12:58:14 +0000 (12:58 +0000)]
Merge "[NAN] Reorder parameters of send message method(s) per API review"

7 years agoMerge "Remove (now) unnecessary reference to core-lambda-stubs."
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

7 years agoMerge "Remove (now) unnecessary reference to core-lambda-stubs."
Treehugger Robot [Mon, 26 Sep 2016 09:55:36 +0000 (09:55 +0000)]
Merge "Remove (now) unnecessary reference to core-lambda-stubs."

7 years agoMerge "[NAN] Add Handler to publish/subscribe per API review"
Etan Cohen [Mon, 26 Sep 2016 00:21:46 +0000 (00:21 +0000)]
Merge "[NAN] Add Handler to publish/subscribe per API review"
am: 95abef9355

Change-Id: I31f34ec26776ae7168128c47cda0fc29d08c7753

7 years ago[NAN] Reorder parameters of send message method(s) per API review
Etan Cohen [Wed, 21 Sep 2016 18:53:24 +0000 (11:53 -0700)]
[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

7 years agoMerge "[NAN] Add Handler to publish/subscribe per API review"
Etan Cohen [Mon, 26 Sep 2016 00:13:42 +0000 (00:13 +0000)]
Merge "[NAN] Add Handler to publish/subscribe per API review"

7 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 24 Sep 2016 22:14:48 +0000 (22:14 +0000)]
Merge "Add missing liblog dependency"
am: 6a7c807d65

Change-Id: Ia590e4b12de01da9a288cda8dfe730a82c319648

7 years agoMerge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 24 Sep 2016 22:07:37 +0000 (22:07 +0000)]
Merge "Add missing liblog dependency"

7 years agoAdd missing liblog dependency
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

7 years ago[NAN] Add Handler to publish/subscribe per API review
Etan Cohen [Wed, 21 Sep 2016 18:18:35 +0000 (11:18 -0700)]
[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

7 years agoMerge "Provide synchronization to setview to avoid NPE"
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

7 years agoMerge "Provide synchronization to setview to avoid NPE"
Treehugger Robot [Fri, 23 Sep 2016 12:57:57 +0000 (12:57 +0000)]
Merge "Provide synchronization to setview to avoid NPE"

7 years agoMerge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
Etan Cohen [Fri, 23 Sep 2016 04:07:30 +0000 (04:07 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
am: bc3d106b97

Change-Id: I1019b5c514424043144351aa893b4f5048e4207e

7 years agoMerge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
Etan Cohen [Fri, 23 Sep 2016 03:59:40 +0000 (03:59 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."

7 years agoMerge changes from topic 'remove-set-frequency-band'
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

7 years agoRemove ability to set frequency from WifiAssociationTest
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

7 years agoRemove WifiManager#get/setFrequencyBand
Christopher Wiley [Thu, 22 Sep 2016 23:50:58 +0000 (23:50 +0000)]
Remove WifiManager#get/setFrequencyBand
am: 79ec1736be

Change-Id: I9b5b298fc3e47e77a59701e7f9d4dc18680f12b8

7 years agoMerge changes from topic 'remove-set-frequency-band'
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

7 years agoMerge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
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

7 years agoMerge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
Treehugger Robot [Thu, 22 Sep 2016 21:56:09 +0000 (21:56 +0000)]
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"

7 years agoMerge "aapt: remove duplicate definition of ZD"
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

7 years agoMerge "aapt: remove duplicate definition of ZD"
Treehugger Robot [Thu, 22 Sep 2016 21:24:46 +0000 (21:24 +0000)]
Merge "aapt: remove duplicate definition of ZD"

7 years agoMerge "Skip uninstalled package for getPackagesForUid()"
liulvping [Thu, 22 Sep 2016 20:30:51 +0000 (20:30 +0000)]
Merge "Skip uninstalled package for getPackagesForUid()"
am: f4c8c3590a

Change-Id: I1e4f7913cc00635611440faabcab4faff7f35dc5

7 years agoRemoved MESSAGE_BIND_PROFILE_SERVICE messages on unbind
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

7 years agoMerge "Skip uninstalled package for getPackagesForUid()"
Treehugger Robot [Thu, 22 Sep 2016 20:00:01 +0000 (20:00 +0000)]
Merge "Skip uninstalled package for getPackagesForUid()"

7 years agoMerge "Remove has_trivial_move trait from StringPool types"
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

7 years agoMerge "Remove has_trivial_move trait from StringPool types"
Colin Cross [Thu, 22 Sep 2016 19:44:27 +0000 (19:44 +0000)]
Merge "Remove has_trivial_move trait from StringPool types"

7 years agoMerge "[ActivityManager] Reset killed flag at attachApplicationLocked"
yuanhuihui [Thu, 22 Sep 2016 17:28:31 +0000 (17:28 +0000)]
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked"
am: 1d5447d70b

Change-Id: Id51a6dabbf1fec793ca0a905454a412359e0cd57

7 years agoRemove has_trivial_move trait from StringPool types
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

7 years agoSkip uninstalled package for getPackagesForUid()
liulvping [Mon, 6 Jun 2016 02:20:48 +0000 (10:20 +0800)]
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>