OSDN Git Service
Etan Cohen [Thu, 29 Sep 2016 23:12:47 +0000 (16:12 -0700)]
[NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
Broadcast can be registered protected (as in this CL) in which case they
are restricted to system apps. Broadcasts sent by the System Service must
be protected (so no one else can fake them).
The WIFI_NAN_STATE_CHANGED is sent by the System Service and no other apps
should be able to send them (e.g. to deny access to NAN to other apps).
(cherry-pick of commit
b8ce87175e3a865feaad7c6aa49226f768729540)
Bug:
31811154
Test: build & run - enable/disable Wi-Fi to trigger bug
Change-Id: I77ea18291d68c38a63d64a75affc6b7ea114e549
Etan Cohen [Thu, 29 Sep 2016 23:02:30 +0000 (16:02 -0700)]
[NAN] Update API javadoc to clarify NAN status change broadcast scope
(cherry-pick of commit
1fceaf9d63cd572cad57e71f6cb66f0cb59183b5)
Bug:
31675932
Test: make -j 32 update-api (to generate doc)
Change-Id: I7263a15902c423c1c71c2c457c82e8caef5abceb
Randy Pan [Fri, 30 Sep 2016 17:30:15 +0000 (17:30 +0000)]
Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate"
Przemyslaw Szczepaniak [Fri, 30 Sep 2016 08:43:17 +0000 (08:43 +0000)]
Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO"
Treehugger Robot [Fri, 30 Sep 2016 01:01:02 +0000 (01:01 +0000)]
Merge "Fix code for new malloc debug enable."
Jordan Liu [Thu, 29 Sep 2016 22:50:14 +0000 (22:50 +0000)]
Merge "Remove migrated config_carrier_wfc_ims_available"
Christopher Ferris [Wed, 28 Sep 2016 21:24:41 +0000 (14:24 -0700)]
Fix code for new malloc debug enable.
When using am dumpheap -n, modify the code to print the new
way malloc debug works instead of the old way.
Also, the old code had a hard-coded number of backtrace frames. The
new code allows this to be variable so the code needed to be modified
for this too.
Test: am dumpheap -n <PID> <FILE> dumps properly.
Change-Id: Id79e4acbe04313090eb2b973f023e5b27591bb7d
Randy Pan [Thu, 29 Sep 2016 20:04:39 +0000 (13:04 -0700)]
Remove the obsoleted ScanResult.isAutoJoinCandidate
Bug:
31565767
Test: unit tests
Change-Id: I3e1ee0e919c800c4d5eeaf94fdc68123b6de542e
Treehugger Robot [Thu, 29 Sep 2016 19:17:36 +0000 (19:17 +0000)]
Merge "Clear pending activity launches when force stop package"
Jordan Liu [Thu, 29 Sep 2016 17:15:04 +0000 (17:15 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig"
Jordan Liu [Thu, 29 Sep 2016 17:15:04 +0000 (17:15 +0000)]
Merge "Remove configs in frameworks/base"
liulvping [Mon, 26 Sep 2016 12:00:15 +0000 (20:00 +0800)]
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>
Shubham Ajmera [Thu, 29 Sep 2016 15:35:36 +0000 (16:35 +0100)]
Add new StrictMode thread policy - DETECT_UNBUFFERED_IO
This will enable the developers to check if they could replace an unbuffered
I/O operation with a corresponding buffered I/O operation.
The policy can be set as follow:
StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
.detectUnbufferedIO().build());
Test: vogar BlockGuardTest
Bug:
3018772
Change-Id: Ib804a8e9980ae40abfd216f8b87c250fd413bd5c
(cherry picked from commit
9b7184a8fd6c940872f1526667dd7933db4bdd5f)w
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"
Treehugger Robot [Thu, 29 Sep 2016 05:00:42 +0000 (05:00 +0000)]
Merge "Reset mCurrentUserId when fingerprintd died"
Jordan Liu [Wed, 31 Aug 2016 19:18:20 +0000 (12:18 -0700)]
Remove migrated config_carrier_wfc_ims_available
config_carrier_wfc_ims_available has already been migrated to
CarrierConfig. This commit removes reference to this carrier config from
non-prebuilt config files.
Merged-In: I74a3296494377e771d5d451db62c554485bbeb98
Merged-In: If47b743547b55e2ff3daf0357372a5d398c8b6ab
Bug:
29873049
Change-Id: I1cbfd074cdde67db6ad2a800198ac0fab37aecf0
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"
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)
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:25:01 +0000 (20:25 +0000)]
Merge "[NAN] Remove builder API using String to translate to byte[]"
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
Treehugger Robot [Wed, 28 Sep 2016 17:41:53 +0000 (17:41 +0000)]
Merge "Rerun of update-api with no changes"
Treehugger Robot [Wed, 28 Sep 2016 17:16:52 +0000 (17:16 +0000)]
Merge "Adds static methods HwBlob.WrapArray(<scalar-type>[] scalarArray)"
Treehugger Robot [Wed, 28 Sep 2016 16:47:02 +0000 (16:47 +0000)]
Merge "hwui: Fix the length of partial updates system property"
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:04:06 +0000 (05:04 +0000)]
Merge "[NAN] Use a hidden class for peer ID opaque handle"
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: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 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:03:44 +0000 (14:03 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60"
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 22:53:16 +0000 (22:53 +0000)]
Merge "[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
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 [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:40:52 +0000 (16:40 +0000)]
Merge "[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
Etan Cohen [Mon, 26 Sep 2016 14:48:48 +0000 (14:48 +0000)]
Merge "[NAN] Remove failure reason codes from API per API review"
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 [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"
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 [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:07:37 +0000 (22:07 +0000)]
Merge "Add 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
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
Treehugger Robot [Fri, 23 Sep 2016 12:57:57 +0000 (12:57 +0000)]
Merge "Provide synchronization to setview to avoid NPE"
Etan Cohen [Fri, 23 Sep 2016 03:59:40 +0000 (03:59 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
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
Treehugger Robot [Thu, 22 Sep 2016 21:56:09 +0000 (21:56 +0000)]
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
Treehugger Robot [Thu, 22 Sep 2016 21:24:46 +0000 (21:24 +0000)]
Merge "aapt: remove duplicate definition of ZD"
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
Treehugger Robot [Thu, 22 Sep 2016 20:00:01 +0000 (20:00 +0000)]
Merge "Skip uninstalled package for getPackagesForUid()"
Colin Cross [Thu, 22 Sep 2016 19:44:27 +0000 (19:44 +0000)]
Merge "Remove 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
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>
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
Treehugger Robot [Thu, 22 Sep 2016 14:54:16 +0000 (14:54 +0000)]
Merge "[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>
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
Ajay Panicker [Thu, 22 Sep 2016 01:32:33 +0000 (01:32 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
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
Etan Cohen [Thu, 22 Sep 2016 00:52:47 +0000 (00:52 +0000)]
Merge "[NAN] Method renames based on API council feedback"
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
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
Andre Eisenbach [Wed, 21 Sep 2016 20:38:31 +0000 (20:38 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
Chris Tate [Wed, 21 Sep 2016 20:26:00 +0000 (20:26 +0000)]
Merge "Fix WallpaperManager APIs"
Etan Cohen [Wed, 21 Sep 2016 20:14:13 +0000 (20:14 +0000)]
Merge "[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
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
Andre Eisenbach [Wed, 21 Sep 2016 17:38:47 +0000 (17:38 +0000)]
Merge "Protect 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)
Neil Fuller [Wed, 21 Sep 2016 16:01:56 +0000 (16:01 +0000)]
Merge "Track 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
Neil Fuller [Wed, 21 Sep 2016 11:45:18 +0000 (11:45 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs"