OSDN Git Service

android-x86/frameworks-base.git
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 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 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 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 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 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>
7 years agoRemove (now) unnecessary reference to core-lambda-stubs.
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

7 years agoMerge "[ActivityManager] Reset killed flag at attachApplicationLocked"
Treehugger Robot [Thu, 22 Sep 2016 14:54:16 +0000 (14:54 +0000)]
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked"

7 years ago[ActivityManager] Reset killed flag at attachApplicationLocked
yuanhuihui [Thu, 22 Sep 2016 10:17:16 +0000 (18:17 +0800)]
[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>
7 years agoMerge "Remove net_bt_stack group and replace it with bluetooth"
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

7 years agoMerge "[NAN] Method renames based on API council feedback"
Etan Cohen [Thu, 22 Sep 2016 04:55:21 +0000 (04:55 +0000)]
Merge "[NAN] Method renames based on API council feedback"
am: dcac00f325

Change-Id: I1eaa81952e2826f25de9e3e9f4edfa23db368f5a

7 years agoProvide synchronization to setview to avoid NPE
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

7 years agoMerge "Remove net_bt_stack group and replace it with bluetooth"
Ajay Panicker [Thu, 22 Sep 2016 01:32:33 +0000 (01:32 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"

7 years ago[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks.
Etan Cohen [Wed, 21 Sep 2016 00:22:35 +0000 (17:22 -0700)]
[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

7 years agoMerge "[NAN] Method renames based on API council feedback"
Etan Cohen [Thu, 22 Sep 2016 00:52:47 +0000 (00:52 +0000)]
Merge "[NAN] Method renames based on API council feedback"

7 years agoMerge changes Iaa153fca,I619e2d8a
Greg Hackmann [Wed, 21 Sep 2016 21:15:30 +0000 (21:15 +0000)]
Merge changes Iaa153fca,I619e2d8a
am: 59acc059a6

Change-Id: Ic657c33aa5fd728d0e5a8fc3c6c23c0fff420844

7 years agoAlarmManagerService: explain some timerfd_create() failures
Greg Hackmann [Wed, 21 Sep 2016 21:15:13 +0000 (21:15 +0000)]
AlarmManagerService: explain some timerfd_create() failures
am: a0126e0857

Change-Id: I7c9e394d2edcca81e757e351f9de25447b33c2f4

7 years agoAlarmManagerService: remove legacy /dev/alarm support
Greg Hackmann [Wed, 21 Sep 2016 21:13:56 +0000 (21:13 +0000)]
AlarmManagerService: remove legacy /dev/alarm support
am: d7151c06f1

Change-Id: Ibefee7970e426f69e62b9f31fb7a38d24ad63c2a

7 years agoMerge changes Iaa153fca,I619e2d8a
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

7 years agoMerge "List btopp.intent.action.ACCEPT broadcast as protected"
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

7 years ago[NAN] Method renames based on API council feedback
Etan Cohen [Tue, 20 Sep 2016 16:23:33 +0000 (09:23 -0700)]
[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

7 years agoMerge "List btopp.intent.action.ACCEPT broadcast as protected"
Andre Eisenbach [Wed, 21 Sep 2016 20:38:31 +0000 (20:38 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected"

7 years agoMerge "Fix WallpaperManager APIs"
Chris Tate [Wed, 21 Sep 2016 20:34:49 +0000 (20:34 +0000)]
Merge "Fix WallpaperManager APIs"
am: 73e89cd290

Change-Id: I6dd139e8ccb71e6c64141733f9de031b20694179

7 years agoMerge "Fix WallpaperManager APIs"
Chris Tate [Wed, 21 Sep 2016 20:26:00 +0000 (20:26 +0000)]
Merge "Fix WallpaperManager APIs"

7 years agoMerge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
Etan Cohen [Wed, 21 Sep 2016 20:21:25 +0000 (20:21 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
am: 84b3d2040a

Change-Id: I3c20098f26db9e30c18407d01b21ffe729318cce

7 years agoMerge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
Etan Cohen [Wed, 21 Sep 2016 20:14:13 +0000 (20:14 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."

7 years ago[NAN] Refactor WifiNanManager to create separate sessions per connect.
Etan Cohen [Thu, 15 Sep 2016 19:15:10 +0000 (12:15 -0700)]
[NAN] Refactor WifiNanManager to create separate sessions per connect.

Separate session enables separate namespace for functions which depend
on a connection to exist.

(cherry-pick of commit a2eb21d1233e921487e3dada1d10ba3e14611168)

Bug: 31470256
Test: unit tests, integration (sl4a) tests.
Change-Id: I8be0bc609e55319446cef149ba49cd6f7a5f446a

7 years agoList btopp.intent.action.ACCEPT broadcast as protected
Jack He [Tue, 20 Sep 2016 23:06:32 +0000 (16:06 -0700)]
List btopp.intent.action.ACCEPT broadcast as protected

Bug: 31604112
Test: manual
Change-Id: Ic5ee837bb895fc5b39b6d1abdd91d8f1d33f62ae

7 years agoMerge "Protect REFRESH_BATCHED_SCAN broadcast"
Andre Eisenbach [Wed, 21 Sep 2016 17:49:45 +0000 (17:49 +0000)]
Merge "Protect REFRESH_BATCHED_SCAN broadcast"
am: 6eb62f8ee3

Change-Id: I013391d9b75b6a968f5c7c449ce7cac0501448f4

7 years agoMerge "Protect REFRESH_BATCHED_SCAN broadcast"
Andre Eisenbach [Wed, 21 Sep 2016 17:38:47 +0000 (17:38 +0000)]
Merge "Protect REFRESH_BATCHED_SCAN broadcast"

7 years agoProtect REFRESH_BATCHED_SCAN broadcast
Ajay Panicker [Tue, 28 Jun 2016 23:12:37 +0000 (16:12 -0700)]
Protect REFRESH_BATCHED_SCAN broadcast

Bug: 29754520
Test: cherry-pick from internal tree
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
(cherry picked from commit 58dd0cd65e7ac9ca0c9ccbf42087baf2df751c61)

7 years agoMerge "Track API changes associated with AbstractMethod refactoring"
Neil Fuller [Wed, 21 Sep 2016 16:18:36 +0000 (16:18 +0000)]
Merge "Track API changes associated with AbstractMethod refactoring"
am: 117ef7eb9d

Change-Id: Icceb5e5aa4ba12ac837b838e07d338a805f37614

7 years agoMerge "Track API changes associated with AbstractMethod refactoring"
Neil Fuller [Wed, 21 Sep 2016 16:01:56 +0000 (16:01 +0000)]
Merge "Track API changes associated with AbstractMethod refactoring"

7 years agoTrack API changes associated with AbstractMethod refactoring
Neil Fuller [Thu, 8 Sep 2016 11:08:22 +0000 (12:08 +0100)]
Track API changes associated with AbstractMethod refactoring

No actual API change.

Bug: 28666126
Bug: 31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: I8755509f9b6e5387e071a3550b197167bab6ae04

7 years agoMerge "Tracking unhiding of java.lang.reflect.Parameter APIs"
Neil Fuller [Wed, 21 Sep 2016 11:52:17 +0000 (11:52 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs"
am: 0acc91e4fc

Change-Id: I5833ef112d1d9031a48b899723cc4f10703d062d

7 years agoMerge "Tracking unhiding of java.lang.reflect.Parameter APIs"
Neil Fuller [Wed, 21 Sep 2016 11:45:18 +0000 (11:45 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs"

7 years agoTracking unhiding of java.lang.reflect.Parameter APIs
Neil Fuller [Tue, 6 Sep 2016 18:04:18 +0000 (19:04 +0100)]
Tracking unhiding of java.lang.reflect.Parameter APIs

Bug: 28666126
Change-Id: I37926f8f221dca7e99ffd233a0990fcfa4d56040

7 years agoMerge "Rename the DnsEventListenerService to NetdEventListenerService"
Michal Karpinski [Wed, 21 Sep 2016 08:39:42 +0000 (08:39 +0000)]
Merge "Rename the DnsEventListenerService to NetdEventListenerService"
am: 1e3f586c10

Change-Id: Ie83aa7e6225a42c11c03eae45f593e74b94efc82

7 years agoMerge "Rename the DnsEventListenerService to NetdEventListenerService"
Michal Karpinski [Wed, 21 Sep 2016 08:34:38 +0000 (08:34 +0000)]
Merge "Rename the DnsEventListenerService to NetdEventListenerService"