Commit Graph

252293 Commits

Author SHA1 Message Date
Randy Pan
634d97add8 Remove the obsoleted ScanResult.isAutoJoinCandidate
Bug: 31565767
Test: unit tests
Change-Id: I3e1ee0e919c800c4d5eeaf94fdc68123b6de542e
2016-09-29 13:12:55 -07:00
Treehugger Robot
00b678dd2d Merge "Clear pending activity launches when force stop package" 2016-09-29 19:17:36 +00:00
Jordan Liu
14f4fd7d0b Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" 2016-09-29 17:15:05 +00:00
Jordan Liu
8abf78dc58 Merge "Remove configs in frameworks/base" 2016-09-29 17:15:05 +00:00
liulvping
b55e42df97 Clear pending activity launches when force stop package
https://code.google.com/p/android/issues/detail?id=223731

It is possible that an activity in pending launches be resumed while
it's package was stopped by some other reason, like uninstall pkg.

Merged-In: I130ded89cee162aa59ac2bf330f026e49e16ef69
Change-Id: I130ded89cee162aa59ac2bf330f026e49e16ef69
Signed-off-by: liulvping <liulvping@xiaomi.com>
2016-09-29 16:42:16 +00:00
Neil Fuller
bd32321b4f Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature" 2016-09-29 13:08:30 +00:00
Neil Fuller
8ac0f45384 Merge "Unhide constants related to type annotations" 2016-09-29 13:07:44 +00:00
Treehugger Robot
b60951f670 Merge "Reset mCurrentUserId when fingerprintd died" 2016-09-29 05:00:42 +00:00
Treehugger Robot
0ac1aa8256 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
2016-09-29 00:00:49 +00:00
Jordan Liu
c95c2344b5 Merge "Remove dial_string_replace configs" 2016-09-28 23:59:20 +00:00
Jordan Liu
715903f3c6 Merge "Add dial_string_replace key to CarrierConfig" 2016-09-28 23:58:35 +00:00
Treehugger Robot
afbe615993 Merge "wifi: add test target/directory for unit testing WiFi framework APIs" 2016-09-28 22:52:31 +00:00
Andreas Gampe
13018f3730 OtaDexopt: Fix after-ota space measure
Actually measure the available space.

Bug: 31458900
Change-Id: I16ecee6c275229bc21e908b88b24152484025bc8
(cherry picked from commit 8d1d2ab5b9)
2016-09-28 15:01:06 -07:00
Andreas Gampe
112e01480f OtaDexoptService: Add tron logging
Log key properties of A/B OTA dexopting.

Bug: 31458900
Change-Id: Iba1e5a40ff8b4998d4d876800ee59940f01afb6e
(cherry picked from commit 77cc8172d3)
2016-09-28 14:54:14 -07:00
Andreas Gampe
1920d7b434 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 dab38e0004)
2016-09-28 14:11:08 -07:00
Andreas Gampe
33c592da0c Installer: Support delete_odex command
Add support for deleting odex files.

Bug: 31347757
Change-Id: I29bca8751bcee8d6981c682fbbc816c73b78ac68
(cherry picked from commit e5fedb9576)
2016-09-28 14:00:20 -07:00
Andreas Gampe
71ea678683 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 d3e07d46d4)
2016-09-28 13:59:03 -07:00
Etan Cohen
1bca5ad210 Merge "[NAN] Remove builder API using String to translate to byte[]" 2016-09-28 20:25:01 +00:00
Treehugger Robot
c1973ecbd2 Merge "Log the error when uncrypt timeouts" 2016-09-28 19:42:29 +00:00
Etan Cohen
60add8ad01 [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 c76ccf3e7e)

Bug: 31470256
Test: unit tests & integration (sl4a) testing.
Change-Id: Id307702627afd8ee579b540d4c2f65359bf9a925
2016-09-28 11:47:24 -07:00
Treehugger Robot
f0aa998233 Merge "Rerun of update-api with no changes" 2016-09-28 17:41:53 +00:00
Treehugger Robot
90acbd86ac Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)" 2016-09-28 17:16:52 +00:00
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 3ead539c01, which
introduced Parameter, and commit
b4fcc6136e 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 57db2b3eea)

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 7df9b7a103)

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
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 0d7863406b)

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 f02ae5e23c)

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