OSDN Git Service
Jordan Liu [Thu, 29 Sep 2016 17:24:26 +0000 (17:24 +0000)]
Merge "Remove configs in frameworks/base"
am:
8abf78dc58
Change-Id: Id6f726608e69b98bf24b71d96c5ce27b2984cec6
Jordan Liu [Thu, 29 Sep 2016 17:23:45 +0000 (17:23 +0000)]
Add cdma_3waycall_flash_delay key to CarrierConfig
am:
bd3f2a7eb0 -s ours
Change-Id: If65e5c6e5196752d163a1f7b617883bc2876258b
Jordan Liu [Thu, 29 Sep 2016 17:15:04 +0000 (17:15 +0000)]
Merge "Remove configs in frameworks/base"
Neil Fuller [Thu, 29 Sep 2016 13:19:02 +0000 (13:19 +0000)]
Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature"
am:
bd32321b4f
Change-Id: I17c55503e18f5f189e56fc0e4fed21616f14f3b0
Neil Fuller [Thu, 29 Sep 2016 13:16:40 +0000 (13:16 +0000)]
Merge "Unhide constants related to type annotations"
am:
8ac0f45384
Change-Id: I982c4f9fa09469d4c25aa23de277a87dd7a391c2
Neil Fuller [Thu, 29 Sep 2016 13:08:30 +0000 (13:08 +0000)]
Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature"
Neil Fuller [Thu, 29 Sep 2016 13:07:44 +0000 (13:07 +0000)]
Merge "Unhide constants related to type annotations"
takuya,souma [Thu, 29 Sep 2016 05:08:13 +0000 (05:08 +0000)]
Merge "Reset mCurrentUserId when fingerprintd died"
am:
b60951f670
Change-Id: I807b8c1b2d053d726c7e16dd8b8f5c2f62bdf8ad
Treehugger Robot [Thu, 29 Sep 2016 05:00:42 +0000 (05:00 +0000)]
Merge "Reset mCurrentUserId when fingerprintd died"
Andreas Gampe [Thu, 29 Sep 2016 00:20:24 +0000 (00:20 +0000)]
Merge changes from topic 'cherry_ota_dexopt'
am:
0ac1aa8256
Change-Id: I737cec666ea0cb5b7aecec02fd70efa9cc833129
Andreas Gampe [Thu, 29 Sep 2016 00:20:13 +0000 (00:20 +0000)]
OtaDexopt: Fix after-ota space measure
am:
13018f3730
Change-Id: I6a5072376f297e844c25480b6cc2ef35f0521804
Andreas Gampe [Thu, 29 Sep 2016 00:19:03 +0000 (00:19 +0000)]
OtaDexoptService: Add tron logging
am:
112e01480f
Change-Id: Ifd402db52e963096fb43ce6e8f84b0eb0039d060
Andreas Gampe [Thu, 29 Sep 2016 00:18:13 +0000 (00:18 +0000)]
OtaDexopt: Downgrade apps when low on space
am:
1920d7b434
Change-Id: I8c2a5e7effd79109633976c9d8db04e0d25eaf2c
Andreas Gampe [Thu, 29 Sep 2016 00:17:30 +0000 (00:17 +0000)]
Installer: Support delete_odex command
am:
33c592da0c
Change-Id: I838156fea13224677d243097b35ba8229b5c52fe
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
Jordan Liu [Thu, 29 Sep 2016 00:15:23 +0000 (00:15 +0000)]
Merge "Remove dial_string_replace configs"
am:
c95c2344b5
Change-Id: I74902917220aaa287472867e69cabdc488f517eb
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
Treehugger Robot [Thu, 29 Sep 2016 00:00:49 +0000 (00:00 +0000)]
Merge changes from topic 'cherry_ota_dexopt'
* changes:
OtaDexopt: Fix after-ota space measure
OtaDexoptService: Add tron logging
OtaDexopt: Downgrade apps when low on space
Installer: Support delete_odex command
Package Manager: Sort list of packages to dexopt
Jordan Liu [Wed, 28 Sep 2016 23:59:20 +0000 (23:59 +0000)]
Merge "Remove dial_string_replace configs"
Jordan Liu [Wed, 28 Sep 2016 23:58:34 +0000 (23:58 +0000)]
Merge "Add dial_string_replace key to CarrierConfig"
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
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"
Andreas Gampe [Mon, 19 Sep 2016 22:18:46 +0000 (15:18 -0700)]
OtaDexopt: Fix after-ota space measure
Actually measure the available space.
Bug:
31458900
Change-Id: I16ecee6c275229bc21e908b88b24152484025bc8
(cherry picked from commit
8d1d2ab5b94f011ed611259df387391f1a1fe60f)
Andreas Gampe [Tue, 13 Sep 2016 18:12:13 +0000 (11:12 -0700)]
OtaDexoptService: Add tron logging
Log key properties of A/B OTA dexopting.
Bug:
31458900
Change-Id: Iba1e5a40ff8b4998d4d876800ee59940f01afb6e
(cherry picked from commit
77cc8172d31fff398b81a039b3fddc8acd1c609b)
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
Andreas Gampe [Sat, 10 Sep 2016 00:50:20 +0000 (17:50 -0700)]
OtaDexopt: Downgrade apps when low on space
When running low on space, attempt to "downgrade" apps to lower
states in the optimization flow to free up space before starting
the OTA.
Bug:
31347757
Change-Id: I3a44b106b83d86d7290f4c557267b319f28de12a
(cherry picked from commit
dab38e000436bf8234955b0333eaecf389e65b6f)
Andreas Gampe [Sat, 10 Sep 2016 00:08:53 +0000 (17:08 -0700)]
Installer: Support delete_odex command
Add support for deleting odex files.
Bug:
31347757
Change-Id: I29bca8751bcee8d6981c682fbbc816c73b78ac68
(cherry picked from commit
e5fedb95761fbffbd80200440f32e99e0d8c6f90)
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)
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
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
Etan Cohen [Wed, 28 Sep 2016 20:25:01 +0000 (20:25 +0000)]
Merge "[NAN] Remove builder API using String to translate to byte[]"
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
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
Treehugger Robot [Wed, 28 Sep 2016 19:42:29 +0000 (19:42 +0000)]
Merge "Log the error when uncrypt timeouts"
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
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
Treehugger Robot [Wed, 28 Sep 2016 17:41:53 +0000 (17:41 +0000)]
Merge "Rerun of update-api with no changes"
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
Treehugger Robot [Wed, 28 Sep 2016 17:16:52 +0000 (17:16 +0000)]
Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"
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
Treehugger Robot [Wed, 28 Sep 2016 16:47:02 +0000 (16:47 +0000)]
Merge "hwui: Fix the length of partial updates system property"
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
Treehugger Robot [Wed, 28 Sep 2016 16:20:55 +0000 (16:20 +0000)]
Merge "fix persistent process is killed and restart again and again"
Neil Fuller [Wed, 28 Sep 2016 15:23:49 +0000 (16:23 +0100)]
Unhide constants related to type annotations
Type annotations are supported in the compiler, but not the
Android runtime. Unhiding these is therefore still
reasonable.
Bug:
30391692
Test: make droid
Change-Id: I39db1099918fe3bd6321f2d755a988cb73f657c6
Neil Fuller [Wed, 28 Sep 2016 14:00:14 +0000 (15:00 +0100)]
Fix AnnotatedElement.getDeclaredAnnotation() generic signature
To match upstream OpenJDK 8.
Bug:
31108290
Test: make droid
Change-Id: Icdf54eb65b8d89ee474ec51eab552ceb3fc6d8ec
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
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
Etan Cohen [Wed, 28 Sep 2016 05:04:06 +0000 (05:04 +0000)]
Merge "[NAN] Use a hidden class for peer ID opaque handle"
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
Dan Albert [Wed, 28 Sep 2016 03:39:23 +0000 (03:39 +0000)]
Move libjnigraphics to ndk_library.
am:
7ce8df32a7
Change-Id: I1eb9e19b6a270a9b24bdff9a5a86a06a1a8d197f
Dan Albert [Wed, 28 Sep 2016 03:38:22 +0000 (03:38 +0000)]
Migrate libandroid.so to ndk_library.
am:
2a8d9c20bd
Change-Id: Iaa9b5929b542307e5c95f1e7fe1d4d275189e683
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.
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
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
Jordan Liu [Tue, 27 Sep 2016 22:24:23 +0000 (22:24 +0000)]
Merge "Add key to CarrierConfig"
am:
154c22d2d4
Change-Id: I5355f13efb084c0785bcce60ef327dc4bc436fe2
Jordan Liu [Tue, 27 Sep 2016 22:19:26 +0000 (22:19 +0000)]
Merge "Add key to CarrierConfig"
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
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
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
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
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
Etan Cohen [Tue, 27 Sep 2016 19:50:43 +0000 (19:50 +0000)]
Merge "[NAN] Rename setTerminateNotificationEnabled per API review"
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
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
Tobias Thierer [Tue, 27 Sep 2016 14:11:45 +0000 (14:11 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60"
am:
9d16a441a6
Change-Id: I90e0bb992f002718c5f509c226fdc0d57e651aff
Tobias Thierer [Tue, 27 Sep 2016 14:03:44 +0000 (14:03 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60"
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
Christopher Wiley [Tue, 27 Sep 2016 13:27:05 +0000 (13:27 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes"
am:
4062bec04e
Change-Id: I0b0a15c94a4cb0475fc29ed3bcbf58ed2d6f00be
Treehugger Robot [Tue, 27 Sep 2016 13:18:53 +0000 (13:18 +0000)]
Merge "Implement untetherAll as calls to stopTethering"
Treehugger Robot [Tue, 27 Sep 2016 13:18:37 +0000 (13:18 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes"
Etan Cohen [Mon, 26 Sep 2016 23:02:29 +0000 (23:02 +0000)]
Merge "[NAN] Fix javadoc links"
am:
4ad6291b08
Change-Id: Ie9d5b4826636488cfa6f41997443a08537895cdc
Etan Cohen [Mon, 26 Sep 2016 22:53:16 +0000 (22:53 +0000)]
Merge "[NAN] Fix javadoc links"
Etan Cohen [Mon, 26 Sep 2016 20:58:07 +0000 (20:58 +0000)]
Merge "[NAN] Fix incorrect log message"
am:
fe0f393116
Change-Id: Ibfc65886bca7dbddf456cfe494b8ee5d3ea74295
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
Etan Cohen [Mon, 26 Sep 2016 20:48:52 +0000 (20:48 +0000)]
Merge "[NAN] Fix incorrect log message"
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
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
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
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"
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
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
Etan Cohen [Mon, 26 Sep 2016 16:40:52 +0000 (16:40 +0000)]
Merge "[NAN] Change Broadcast for NAN status change to notification only"
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
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
Etan Cohen [Mon, 26 Sep 2016 14:48:48 +0000 (14:48 +0000)]
Merge "[NAN] Remove failure reason codes from API per API review"
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
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
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
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
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
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
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"
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
Treehugger Robot [Mon, 26 Sep 2016 09:55:36 +0000 (09:55 +0000)]
Merge "Remove (now) unnecessary reference to core-lambda-stubs."
takuya,souma [Tue, 13 Sep 2016 07:58:08 +0000 (16:58 +0900)]
Reset mCurrentUserId when fingerprintd died
A template fingerprint data is not loaded in fingerprintd when
fingerprintd is died and restarted.
FigerprintService tries to set userId after a restart of fingerprintd,
but it's skipped because the service tries to set same userId already
set to mCurrentUserId.
To load correct template fingerprint data, reset mCurrentUserId
when fingerprintd died.
Bug:
31734514
Change-Id: I0d3452fc6c1f82bb2a2af10f61d3f3a47df9dec6
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
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
Etan Cohen [Mon, 26 Sep 2016 00:13:42 +0000 (00:13 +0000)]
Merge "[NAN] Add Handler to publish/subscribe per API review"
Dimitry Ivanov [Sat, 24 Sep 2016 22:14:48 +0000 (22:14 +0000)]
Merge "Add missing liblog dependency"
am:
6a7c807d65
Change-Id: Ia590e4b12de01da9a288cda8dfe730a82c319648
Dimitry Ivanov [Sat, 24 Sep 2016 22:07:37 +0000 (22:07 +0000)]
Merge "Add missing liblog dependency"
OSDN Git Service
