252475 Commits

Author SHA1 Message Date
Treehugger Robot
faf945a773 Merge "hwui: Fix the length of partial updates system property" 2016-09-28 16:47:03 +00:00
Treehugger Robot
ae302cef52 Merge "fix persistent process is killed and restart again and again" 2016-09-28 16:20:56 +00:00
Neil Fuller
4c1d37b2a0 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
2016-09-28 16:57:59 +01:00
Neil Fuller
0543f71b82 Fix AnnotatedElement.getDeclaredAnnotation() generic signature
To match upstream OpenJDK 8.

Bug: 31108290
Test: make droid
Change-Id: Icdf54eb65b8d89ee474ec51eab552ceb3fc6d8ec
2016-09-28 16:56:49 +01:00
Neil Fuller
b36fad8a5f 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
2016-09-28 16:51:03 +01:00
Etan Cohen
e43c1a3e3e Merge "[NAN] Use a hidden class for peer ID opaque handle" 2016-09-28 05:04:06 +00:00
Treehugger Robot
00a19a37db Merge changes from topic 'libandroid-ndk_headers'
* changes:
  Move libjnigraphics to ndk_library.
  Migrate libandroid.so to ndk_library.
2016-09-28 03:32:56 +00:00
Etan Cohen
f085c1951a [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
2016-09-27 16:42:05 -07:00
Jordan Liu
705cbc763f 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
2016-09-27 15:35:27 -07:00
Jordan Liu
154c22d2d4 Merge "Add key to CarrierConfig" 2016-09-27 22:19:26 +00:00
Peter Qiu
601964b927 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
2016-09-27 15:13:20 -07:00
Dan Albert
7ce8df32a7 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
2016-09-27 13:59:05 -07:00
Dan Albert
2a8d9c20bd Migrate libandroid.so to ndk_library.
Test: make native
Bug: http://b/30465923
Change-Id: I956b5014c4da4dce1ce28da706b9d868eba4cce3
2016-09-27 13:59:04 -07:00
Tianjie Xu
036d08638e 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
2016-09-27 13:34:58 -07:00
Etan Cohen
5d74bf9f95 Merge "[NAN] Rename setTerminateNotificationEnabled per API review" 2016-09-27 19:50:44 +00:00
Andreas Huber
906a679aa8 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
2016-09-27 11:20:44 -07:00
Etan Cohen
6c48c33735 [NAN] Rename setTerminateNotificationEnabled per API review
(cherry-pick of commit 7df9b7a1039ea8e34e82e650cebd1025a2591580)

Bug: 31470256
Test: unit tests + integrated (sl4a) tests
Change-Id: I1554b5b7961a5c46656a40ad395431125da7aa7f
2016-09-27 10:53:47 -07:00
Tobias Thierer
9d16a441a6 Merge "API: Update ResourceBundle to OpenJDK8u60" 2016-09-27 14:03:45 +00:00
Treehugger Robot
7fd48d54de Merge "Implement untetherAll as calls to stopTethering" 2016-09-27 13:18:53 +00:00
Treehugger Robot
4062bec04e Merge "Notify NetworkPolicyManagerService on tethering changes" 2016-09-27 13:18:38 +00:00
Etan Cohen
4ad6291b08 Merge "[NAN] Fix javadoc links" 2016-09-26 22:53:17 +00:00
Tobias Thierer
45716d6539 API changes for Locale to OpenJDK8u60 (part 1/2)
Bug: 29935305

Test: make update-api

Change-Id: I11f22dba5c795f7016c6dac950166ab749a7423d
2016-09-26 22:16:51 +01:00
Etan Cohen
7c724e6708 [NAN] Fix javadoc links
(cherry-pick of commit ee3d9fc5e60ce4b57dbba7483ac323ed29df2e4a)

Bug: 31470256
Test: builds (javadoc only)
Change-Id: I645525660b9a6759f968d9e62cd79d6a851815bf
2016-09-26 13:54:50 -07:00
Etan Cohen
fe0f393116 Merge "[NAN] Fix incorrect log message" 2016-09-26 20:48:52 +00:00
ryang
647bc13709 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
2016-09-26 16:05:06 -04:00
Etan Cohen
41d6f375be [NAN] Fix incorrect log message
(cherry-pick of commit 0d7863406b1542c3092fa976cfb41b09a97dd8bd)

Bug: 31678708
Test: integrated (sl4a) test
Change-Id: I822c66619642f08d1d8f68cc8257185360da60be
2016-09-26 11:53:28 -07:00
Etan Cohen
88da460cd8 Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" 2016-09-26 18:50:36 +00:00
Etan Cohen
27c18cbb5b [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
2016-09-26 10:14:35 -07:00
Etan Cohen
e1513a8cc6 Merge "[NAN] Change Broadcast for NAN status change to notification only" 2016-09-26 16:40:53 +00:00
Etan Cohen
93617997bb [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
2016-09-26 07:53:57 -07:00
Etan Cohen
a7b2fff388 Merge "[NAN] Remove failure reason codes from API per API review" 2016-09-26 14:48:48 +00:00
Treehugger Robot
fe9357f6e7 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
2016-09-26 14:04:57 +00:00
Etan Cohen
5542ccc59c [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
2016-09-26 06:05:06 -07:00
Etan Cohen
1dd012a41a Merge "[NAN] Reorder parameters of send message method(s) per API review" 2016-09-26 12:58:14 +00:00
Treehugger Robot
68e91852c3 Merge "Remove (now) unnecessary reference to core-lambda-stubs." 2016-09-26 09:55:36 +00:00
takuya,souma
895da77aa6 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
2016-09-26 14:42:43 +09:00
Etan Cohen
8a66410296 [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
2016-09-25 17:19:05 -07:00
Etan Cohen
95abef9355 Merge "[NAN] Add Handler to publish/subscribe per API review" 2016-09-26 00:13:42 +00:00
Dimitry Ivanov
6a7c807d65 Merge "Add missing liblog dependency" 2016-09-24 22:07:37 +00:00
Dimitry Ivanov
1f34a1baeb Add missing liblog dependency
Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and recompile
Change-Id: I71f402a04686b7bd6ee6adacda7b51280f5c7b92
2016-09-23 17:20:32 -07:00
Dimitry Ivanov
9e9061f608 Relax namespace restriction on system server classloader
Add java.library.path to list of permitted paths
for system server classloader. This allows libraries
loaded in system server classloader namespace to
dlopen libraries under /system/lib/somedir

Test: m
Bug: http://b/31652397
Change-Id: Ief70aaa81cde4983c8de1e07b4ef23e1fadf35a0
2016-09-23 15:03:27 -07:00
Etan Cohen
ede1d0f211 [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
2016-09-23 10:16:26 -07:00
Treehugger Robot
b05b93a674 Merge "Provide synchronization to setview to avoid NPE" 2016-09-23 12:57:58 +00:00
Etan Cohen
bc3d106b97 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." 2016-09-23 03:59:40 +00:00
Christopher Wiley
430904a4ab Merge changes from topic 'remove-set-frequency-band'
* changes:
  Remove ability to set frequency from WifiAssociationTest
  Remove WifiManager#get/setFrequencyBand
2016-09-22 23:34:17 +00:00
Treehugger Robot
3b0256fc73 Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" 2016-09-22 21:56:10 +00:00
Treehugger Robot
ac2d839d7c Merge "aapt: remove duplicate definition of ZD" 2016-09-22 21:24:49 +00:00
Pavlin Radoslavov
74f60c0de8 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
2016-09-22 20:05:22 +00:00
Treehugger Robot
f4c8c3590a Merge "Skip uninstalled package for getPackagesForUid()" 2016-09-22 20:00:01 +00:00
Colin Cross
d333f28397 Merge "Remove has_trivial_move trait from StringPool types" 2016-09-22 19:44:28 +00:00