OSDN Git Service
Calin Juravle [Wed, 11 Jan 2017 02:28:11 +0000 (02:28 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...
am:
619d6282c3
Change-Id: I7f13f7a7557288f2b5cc515b424161c946241d5a
Calin Juravle [Wed, 11 Jan 2017 02:28:08 +0000 (02:28 +0000)]
Add an extra debug flag to BackgroundDexOptimizer
am:
3a2b7f7d59
Change-Id: I309923c247bef67ffbdba56955582f6decde3800
Calin Juravle [Wed, 11 Jan 2017 02:27:25 +0000 (02:27 +0000)]
Some refactoring in BackgroundDexOptService.
am:
95176bb18e
Change-Id: I191aeed8a7264bb13c4cef8b1ba135fd03a75d58
Calin Juravle [Wed, 11 Jan 2017 02:26:36 +0000 (02:26 +0000)]
Do not try to resolve realpath in DexManager.
am:
b96dba9bad
Change-Id: I67aba48784bca9a51f63e47b54c211ba535dd0e4
Calin Juravle [Wed, 11 Jan 2017 02:25:05 +0000 (02:25 +0000)]
Log DexManager realpath errors only in debug mode.
am:
271bacbf5c
Change-Id: I94aca4959284912e6d5008f56617254be2fc3ea7
Calin Juravle [Wed, 11 Jan 2017 02:24:14 +0000 (02:24 +0000)]
Record data about dex files use on disk
am:
5a9094c1b6
Change-Id: I50378b1351a5ae83ac55f1b26e2e0c5f3230c6d2
Calin Juravle [Wed, 11 Jan 2017 02:23:29 +0000 (02:23 +0000)]
Add logic for recording dex files use on disk
am:
6ea5ace7b3
Change-Id: I82246efd8e78c1c4ac18a67f0274b10545605207
Stephen Chen [Wed, 11 Jan 2017 02:20:14 +0000 (02:20 +0000)]
Merge "Delete old WifiNotificationController strings."
am:
6daef4499f
Change-Id: I20a68ca904cc0ad8042be61820808f4ff4680bee
Treehugger Robot [Wed, 11 Jan 2017 02:15:28 +0000 (02:15 +0000)]
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ...
* changes:
Add an extra debug flag to BackgroundDexOptimizer
Some refactoring in BackgroundDexOptService.
Do not try to resolve realpath in DexManager.
Log DexManager realpath errors only in debug mode.
Record data about dex files use on disk
Add logic for recording dex files use on disk
Treehugger Robot [Wed, 11 Jan 2017 02:12:48 +0000 (02:12 +0000)]
Merge "Delete old WifiNotificationController strings."
Jeremy Joslin [Wed, 11 Jan 2017 01:41:14 +0000 (01:41 +0000)]
Merge "Moved isCallerActiveScorer() to the score service."
am:
663b444196
Change-Id: I44134284edc88567703435ce663b3d0efd9cff26
Treehugger Robot [Wed, 11 Jan 2017 01:30:02 +0000 (01:30 +0000)]
Merge "Moved isCallerActiveScorer() to the score service."
Hugo Benichi [Wed, 11 Jan 2017 01:18:07 +0000 (01:18 +0000)]
Merge changes I559eb049,I52425b84
am:
60d10ea0f4
Change-Id: Ided0ebc7e0aaab0f88c2b0af7e3e99fa9e674a60
Hugo Benichi [Wed, 11 Jan 2017 01:18:00 +0000 (01:18 +0000)]
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
am:
2c02197bdd -s ours
Change-Id: I12ea7b87369c3228bb1fcc914cfdb316a3b501ce
Hugo Benichi [Wed, 11 Jan 2017 01:17:16 +0000 (01:17 +0000)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
am:
7f086e162b -s ours
Change-Id: Id2f32089145a13a199838d8c004504fee1c7c011
Hugo Benichi [Wed, 11 Jan 2017 01:14:10 +0000 (01:14 +0000)]
Merge changes I1eaab5ea,I42928da8
am:
b1e3c8aaf4
Change-Id: I744394de40b72744ac60f3d6c2a138c6e876ee28
Hugo Benichi [Wed, 11 Jan 2017 01:14:04 +0000 (01:14 +0000)]
DO NOT MERGE Captive portal systel log improvements
am:
b32417a772 -s ours
Change-Id: Ibce1d4e604e5fd8c67c012cd7f264e4585117b24
Hugo Benichi [Wed, 11 Jan 2017 01:12:54 +0000 (01:12 +0000)]
DO NOT MERGE Fix flaky IpPrefixTest.
am:
f6b180ff1a -s ours
Change-Id: I929a0ef7a6a044d2263a04867c2701653c3634de
John Reck [Wed, 11 Jan 2017 01:11:59 +0000 (01:11 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
am:
95ef9ec5b1
Change-Id: I0b088bc47b1311ace1000cc700fd81d56eec4b7f
Treehugger Robot [Wed, 11 Jan 2017 01:06:56 +0000 (01:06 +0000)]
Merge changes I559eb049,I52425b84
* changes:
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
Treehugger Robot [Wed, 11 Jan 2017 01:02:05 +0000 (01:02 +0000)]
Merge changes I1eaab5ea,I42928da8
* changes:
DO NOT MERGE Captive portal systel log improvements
DO NOT MERGE Fix flaky IpPrefixTest.
John Reck [Wed, 11 Jan 2017 00:57:34 +0000 (00:57 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
Calin Juravle [Thu, 22 Dec 2016 16:50:05 +0000 (18:50 +0200)]
Add an extra debug flag to BackgroundDexOptimizer
This makes testing/debugging the job a bit easier.
Test: device boots, packages get compiled
Bug:
32871170
(cherry picked from commit
a50d58e22630cd651a815381639e70476991bdbf)
Change-Id: I5b94a8f0b3bbf9075dcaecf028aaf79a21aaab7b
Calin Juravle [Thu, 22 Dec 2016 16:50:05 +0000 (18:50 +0200)]
Some refactoring in BackgroundDexOptService.
Extract postOta/idle optimizations in their own method.
In preparation for adding the logic to handle secondary dex files.
Test: device boots, pacakges get compiled
Bug:
32871170
(cherry picked from commit
be6a71a0b3f369843a26c91dd5123d0499f00e7e)
Change-Id: Ie6cdd8461e7214f5de68bc9172f4171ebf72aa39
Calin Juravle [Thu, 22 Dec 2016 16:47:05 +0000 (18:47 +0200)]
Do not try to resolve realpath in DexManager.
PM should already provide the real path of the application directory.
Test: runtest -x .../DexManagerTests.java
Bug:
33807524
Bug:
32871170
(cherry picked from commit
c066205cea051c6d9f386188b9cb426c03dbee2d)
Change-Id: Ie6b5f5e61d08710e7ef7d3149b7b13cc7d03a242
Calin Juravle [Thu, 22 Dec 2016 14:31:19 +0000 (14:31 +0000)]
Log DexManager realpath errors only in debug mode.
Test: runtest -x .../DexManagerTests.java
Bug:
33807524
(cherry picked from commit
bb9ed1f3c93f0267fa97d6cbeb58ecd1de41d795)
Change-Id: Ib962edf67ce7f5b9b93c9bc6855675e00e025810
Calin Juravle [Fri, 16 Dec 2016 16:22:00 +0000 (16:22 +0000)]
Record data about dex files use on disk
Add DexManager to keep track of how dex files are used.
Every time a dex file is loaded, PackageManager will notify DexManager
which will process the load. The DexManager will look up what package
owns the dex file and record its use in package-dex-usage.list (through
PackageDexUsage).
Test: device boots, package-dex-usage.list is created and contains valid data, after device reboot the list is succesfully read from disk.
runtest -x .../PackageDexUsageTests.java
runtest -x .../DexManagerTests.java
Bug:
32871170
(cherry picked from commit
b8976d8f22fecaa9ed39276d9d8ded17d35b51a6)
Change-Id: I9d779b2d39814d7c54fc7a888df93d403a001df5
Calin Juravle [Thu, 1 Dec 2016 17:53:07 +0000 (17:53 +0000)]
Add logic for recording dex files use on disk
Add PackageDexUsage to handle the I/O operations of dex usage data. It
is responsible to encode, save and load dex
Test: runtest -x .../PackageDexUsageTests.java
Bug:
32871170
(cherry picked from commit
0318162abcbd07a0472989df43e00e353fac731b)
Change-Id: I6d483d480d62aa14cb1663560fd88092469a2835
Jeremy Joslin [Tue, 10 Jan 2017 00:22:20 +0000 (16:22 -0800)]
Moved isCallerActiveScorer() to the score service.
Implemented isCallerActiveScorer() in the NetworkScoreService to make
it more efficient (no need to query PM). Exposed the call as a new
internal API on NetworkScoreManager and deprecated the call on
NetworkScorerAppManager.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
33781558
Change-Id: I8ad232f8ef34b6e2f155ebb232e64300303300f0
Merged-In: I0e2142af95b068d322343f7c9362ac53d46b545e
George Burgess IV [Tue, 10 Jan 2017 23:33:57 +0000 (15:33 -0800)]
Fix a use-of-uninitialized-value warning.
This warning was generated by the static analyzer:
warning: The left expression of the compound assignment is an
uninitialized value. The computed value will also be garbage
*mDirtyMask |= animator->dirtyMask();
This can be fixed by initializing dirtyMask before using it in
AnimateFunctor.
Bug: None
Test: Static analyzer no longer complains about this.
Change-Id: I892749079cf93a012f1bed059a3f0c8bbaed9d7e
Jordan Liu [Tue, 10 Jan 2017 22:59:18 +0000 (22:59 +0000)]
Merge "Fix naming of key"
am:
0b74a1dabb
Change-Id: I8eaaee259d96c2c2da70828cd882a86ae6bde8f1
Jordan Liu [Tue, 10 Jan 2017 22:51:49 +0000 (22:51 +0000)]
Merge "Fix naming of key"
Robert Sesek [Tue, 10 Jan 2017 22:33:04 +0000 (22:33 +0000)]
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc
am:
98d86fe2b7
Change-Id: If98bcf93212e84c0e01eb3281b729e1760762356
Robert Sesek [Tue, 10 Jan 2017 22:33:00 +0000 (22:33 +0000)]
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
am:
54e387ddbe
Change-Id: I7b4e809767e4cdd64da4094decc929504e1e93d8
Robert Sesek [Tue, 10 Jan 2017 22:32:05 +0000 (22:32 +0000)]
Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
am:
8225b7c951
Change-Id: Ic5a021e5851f158caddc7f58ad7098a070f6219a
Narayan Kamath [Tue, 10 Jan 2017 22:30:41 +0000 (22:30 +0000)]
Zygote: Additional whitelisting for legacy devices.
am:
f701ba36b3
Change-Id: Ic12fdc0261f258dcd1019290a057fef4fcedd0f3
Narayan Kamath [Tue, 10 Jan 2017 22:29:55 +0000 (22:29 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
0ff7ef60f5
Change-Id: Ia4ee03a2a8e801918306cacf5ff1f69401f3847d
Jeremy Joslin [Tue, 10 Jan 2017 22:28:51 +0000 (22:28 +0000)]
Merge "Cleanup test method names."
am:
8e9fd295c8
Change-Id: Idb000e2b6cd8b7ba2046d329e039f6b05424686e
Treehugger Robot [Tue, 10 Jan 2017 22:21:01 +0000 (22:21 +0000)]
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc
* changes:
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
Zygote: Additional whitelisting for legacy devices.
Zygote: Additional whitelists for runtime overlay / other static resources.
Treehugger Robot [Tue, 10 Jan 2017 22:18:56 +0000 (22:18 +0000)]
Merge "Cleanup test method names."
Tao Wu [Tue, 10 Jan 2017 21:29:16 +0000 (21:29 +0000)]
Merge "Remove unused variable."
am:
f3b1881bb2
Change-Id: I563647e4f5abc635ff3f67d7f0b658bdd1d92716
Treehugger Robot [Tue, 10 Jan 2017 21:15:01 +0000 (21:15 +0000)]
Merge "Remove unused variable."
Jeremy Joslin [Tue, 10 Jan 2017 16:53:02 +0000 (08:53 -0800)]
Cleanup test method names.
Renamed some test methods to reflect the proper permission.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
1764042
Change-Id: Ia7db8826ad18c3b8f119aa063cb2c7b3793a9d17
Merged-In: I5551ddcb411432c6aeb14c03d9a284aa68f1bd1b
Robert Sesek [Fri, 2 Dec 2016 22:27:50 +0000 (17:27 -0500)]
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
This refactors the whitelist to be a class, rather than just a static C array.
The whitelist can then be augmented dynamically when the package path is known
in the webview_zygote.
Test: m
Test: sailfish boots
Test: Enable Multi-process WebView in developer options, perform a search in GSA.
Bug:
21643067
Change-Id: Ia1f2535c7275b42b309631b4fe7859c30cbf7309
(cherry picked from commit
061ee3088a79ab0e07d37d1c0897d51422f29c4e)
Robert Sesek [Fri, 16 Dec 2016 19:02:31 +0000 (14:02 -0500)]
Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
(cherry picked from commit
44afe8be8f654192dc436a9c4238a925c22b14bf)
Test: m
Test: sailfish boots
Change-Id: I9ca93f31f6c20b702b2207333a9d56f6592630b0
Narayan Kamath [Mon, 7 Nov 2016 19:59:29 +0000 (19:59 +0000)]
Zygote: Additional whitelisting for legacy devices.
On M and below, we provide a blanket whitelist for all files under
"/vendor/zygote_whitelist". This path is whitelisted purely to allow
this patch to be applied easily on legacy devices and configurations.
Note that this does not amount to a loosening of our security policy
because whitelisted files are reopened anyway.
(cherry picked from commit
5e2f7c6229d7191183888d685b57a7d0a2835fce)
Bug:
32691930
Test: manual
Change-Id: If5b53f6f0a707f8d36603c09bfd3f72dbfbbbb99
Tao Wu [Fri, 11 Nov 2016 18:42:02 +0000 (10:42 -0800)]
Remove unused variable.
Code search show nobody referenced it and aosp image still compiles after
remove it.
Test: make -j18 systemimage userdataimage ramdisk
Change-Id: I3e37ea590610091b938296c999dceb3caf919906
Merged-In: I3e37ea590610091b938296c999dceb3caf919906
Signed-off-by: Tao Wu <lepton@google.com>
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
Bug:
32618130
Test: m
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
Stephen Chen [Tue, 13 Dec 2016 22:44:18 +0000 (14:44 -0800)]
Delete old WifiNotificationController strings.
Bug:
33355924
Test: make
Change-Id: Ia7065549168b4f342760e2f77efe4d9eb1851eb9
Jeff Sharkey [Tue, 10 Jan 2017 04:38:15 +0000 (04:38 +0000)]
Merge "Methods to calculate user and external disk usage."
am:
6a9ad14172
Change-Id: Ie4ab045a5425b35ce1bdd245f7c6ab248c796df2
Jeff Sharkey [Tue, 10 Jan 2017 04:30:46 +0000 (04:30 +0000)]
Merge "Methods to calculate user and external disk usage."
John Reck [Tue, 10 Jan 2017 00:39:28 +0000 (00:39 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age"
am:
f66126c828
Change-Id: I649478ca7aa33de82a1524dfe9925c0a2d82a7a7
Treehugger Robot [Tue, 10 Jan 2017 00:26:42 +0000 (00:26 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age"
Jeff Sharkey [Mon, 9 Jan 2017 00:06:58 +0000 (17:06 -0700)]
Methods to calculate user and external disk usage.
Add method to calculate user disk usage, which will be faster than
making a Binder call for every single appId under a user. Add method
to calculate external disk usage, which uses file extensions to track
usage with "audio", "video", and "images" categories.
Start measuring internal and external storage space separately; new
GIDs are coming in a future CL. Pass down all package names, inodes,
and code paths, since shared UIDs host more than one.
Test: builds, boots, stats are consistent
Bug:
27948817,
32206268
Change-Id: Icbb82a30fe711ef05e9a16bb1dc740dc943a9ddc
Sundeep Ghuman [Mon, 9 Jan 2017 23:51:07 +0000 (23:51 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes."
am:
e34e47d645
Change-Id: Ibeb6c60c30c302e12c45c7f35a7e4af904a4a6d5
Amin Shaikh [Mon, 9 Jan 2017 23:45:15 +0000 (23:45 +0000)]
Merge "Expose fields in WifiConfiguration."
am:
1ea4180c3a
Change-Id: I6a145981692cbaf791b735d55a1a9b7aa24aee62
Treehugger Robot [Mon, 9 Jan 2017 23:39:47 +0000 (23:39 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes."
Treehugger Robot [Mon, 9 Jan 2017 23:33:24 +0000 (23:33 +0000)]
Merge "Expose fields in WifiConfiguration."
Jack Yu [Mon, 9 Jan 2017 23:10:55 +0000 (23:10 +0000)]
Merge "Moved implicit intents into explicit intents"
am:
ccda81e58f
Change-Id: I90ccdbceba9492f95c658a7fabd113a35dcc8ae2
John Reck [Tue, 27 Sep 2016 21:45:28 +0000 (14:45 -0700)]
Support EGL_KHR_partial_update without EGL_EXT_buffer_age
Bug:
31334677
Test: manual && hwuimacro --onscreen partialdamage
Change-Id: I9b346b4053ec12c8a78a143a4dc0e708c44888a2
Jack Yu [Mon, 9 Jan 2017 22:33:12 +0000 (14:33 -0800)]
Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a
Test: manual
Change-Id: I228ed62db45eeb5d384049b5b0fef57b0bcf9ac6
Treehugger Robot [Mon, 9 Jan 2017 22:02:36 +0000 (22:02 +0000)]
Merge "Moved implicit intents into explicit intents"
Jeremy Joslin [Mon, 9 Jan 2017 21:00:13 +0000 (21:00 +0000)]
Merge "Make REQUEST_NETWORK_SCORES signature only."
am:
1f89f3d1da
Change-Id: I4fff314194584e78c86e3b0ae1de40fd7f2501f4
Jeremy Joslin [Mon, 9 Jan 2017 20:58:50 +0000 (20:58 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
am:
4c456d7ddf
Change-Id: I441cae5096b922419763832d5b38faa95818e337
Sundeep Ghuman [Fri, 16 Dec 2016 21:30:45 +0000 (13:30 -0800)]
Cherrypick: Create ScoredNetwork Badging API changes.
Defines an attribute bundles key to hold the badging curve, the
enums for badge values, and an API to retrieve a badge for a
specific RSSI.
OCL: ag/
1727147
Bug:
33457699
Test: Unit tests
Change-Id: If9e8a60c4670b51c395fb501f55ddece8a72981e
Merged-In: If9e8a60c4670b51c395fb501f55ddece8a72981e
Treehugger Robot [Mon, 9 Jan 2017 20:51:33 +0000 (20:51 +0000)]
Merge "Make REQUEST_NETWORK_SCORES signature only."
Treehugger Robot [Mon, 9 Jan 2017 20:45:51 +0000 (20:45 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
Jeremy Joslin [Fri, 6 Jan 2017 22:38:57 +0000 (14:38 -0800)]
Make REQUEST_NETWORK_SCORES signature only.
There are no use cases where it's needed by a privileged app today.
Test: Built and ran
BUG:
33752149
Change-Id: Ia63a86eca1f60644d25f037d395a08c541a06a08
Merged-In: Iae689e878fdb60b506536c918079a4fcff527a71
Jeremy Joslin [Fri, 6 Jan 2017 22:36:54 +0000 (14:36 -0800)]
Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33752149
Change-Id: I3dd352c98bbc34b128ab9c2a28f81e1261ae2669
Merged-In: I7d91fa9a4f6ef4f9170c6af98567ce443c805e74
Amin Shaikh [Fri, 6 Jan 2017 18:00:33 +0000 (10:00 -0800)]
Expose fields in WifiConfiguration.
hasNoInternetAccess and isNoInternetAccessExpected are key signals needed
to determine whether Wi-Fi should be woken up for a given saved network.
Test: make
Bug:
33224312
Change-Id: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
Merged-In: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
Alex Naidis [Mon, 9 Jan 2017 16:59:56 +0000 (16:59 +0000)]
Merge "StorageManager: Improve exception handling"
am:
cf3a4a68bd
Change-Id: Id421cb483655dab6d379251d983da2bdcafe598d
Treehugger Robot [Mon, 9 Jan 2017 16:48:35 +0000 (16:48 +0000)]
Merge "StorageManager: Improve exception handling"
Alex Naidis [Wed, 4 Jan 2017 17:52:36 +0000 (18:52 +0100)]
StorageManager: Improve exception handling
When "getPrimaryStorageSize" provides a path
to "readLong", the option that the path
doesn't exist is expected, since it tries
all paths from "INTERNAL_STORAGE_SIZE_PATHS"
until there is success.
This patch makes us catch the "FileNotFoundException"
and "NumberFormatException" seperately.
For the above reason a "FileNotFoundException"
is now treated as an information only.
The "NumberFormatException" and other exceptions
are now treated as error since those are not
expected to happen.
Change-Id: I5316f9c3108e36c31b27dc5df8bf8ac4d4257629
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:17:06 +0000 (11:17 +0000)]
Merge "Track libcore/jsr-166 update"
am:
f6f36d7d9a
Change-Id: I6ba30b86fa45403631233ede5994eac0748d9b37
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:08:34 +0000 (11:08 +0000)]
Merge "Track libcore/jsr-166 update"
Przemyslaw Szczepaniak [Thu, 29 Dec 2016 14:28:51 +0000 (14:28 +0000)]
Track libcore/jsr-166 update
No functional changes.
Update after the switch from custom to openJdk-based implementation of
java.util.concurrent.CopyOnWriteArrayList class.
Tracks libcore commit
29957558cf0db700bfaae360a80c42dc3871d0e5.
Test: make -j 32
Bug:
30860904
Change-Id: I4435bc1fb5ef9fc4ee5f882370073ba8ce2bcfba
Nick Kralevich [Sun, 8 Jan 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Dumps total size of primary storage."
am:
55dc66dde4
Change-Id: Ifc3537d3aeda5e6eb3b1c003a4eaf392d07bcf86
Nick Kralevich [Sun, 8 Jan 2017 14:53:08 +0000 (14:53 +0000)]
Merge "Dumps total size of primary storage."
Peter Qiu [Sun, 8 Jan 2017 07:00:57 +0000 (07:00 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update"
am:
b1c9bc5ea5
Change-Id: I47d8e12fbb7bc3faefabbed02b7235396eb6dbe5
Treehugger Robot [Sun, 8 Jan 2017 06:51:51 +0000 (06:51 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update"
Felipe Leme [Tue, 11 Oct 2016 00:12:20 +0000 (17:12 -0700)]
Dumps total size of primary storage.
BUG:
32069168
Test: manual verification
(cherry picked from commit
281389ac5475e483d10a2e8aa31195b9e9875246)
Change-Id: If5dee52a99c03a00dada22736c09d953dc0b66d1
Etan Cohen [Sat, 7 Jan 2017 20:13:33 +0000 (20:13 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback"
am:
bbbe5e6ccd
Change-Id: Iede092421659c5ae55475f153d940d97dac6b7b0
Etan Cohen [Sat, 7 Jan 2017 20:05:37 +0000 (20:05 +0000)]
Merge "[AWARE] Remove reason from discovery session terminate callback"
Etan Cohen [Sat, 7 Jan 2017 18:20:31 +0000 (18:20 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace"
am:
834a87d525
Change-Id: I243194a658ee8e9c5a21301601a473149eaa8a2f
Etan Cohen [Sat, 7 Jan 2017 18:12:33 +0000 (18:12 +0000)]
Merge "[AWARE] Simplify Wi-Fi Aware API namespace"
Jack Yu [Thu, 5 Jan 2017 23:19:31 +0000 (15:19 -0800)]
Moved implicit intents into explicit intents
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.
The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver
bug:
33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
Merged-In: I64db3b05400513bacf278ff9f93236495860803e
Alex Naidis [Sat, 7 Jan 2017 01:40:42 +0000 (01:40 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
am:
0b325c6634
Change-Id: I5d217037bececb7a096ccfa018fafaa4280e4537
Treehugger Robot [Sat, 7 Jan 2017 01:33:18 +0000 (01:33 +0000)]
Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
Pavlin Radoslavov [Sat, 7 Jan 2017 01:25:34 +0000 (01:25 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
am:
bfd7f9a1f8
Change-Id: I0cc5f64f292a56e6301b294974c1bd3cc72664c0
Treehugger Robot [Sat, 7 Jan 2017 01:19:33 +0000 (01:19 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
Etan Cohen [Sat, 24 Dec 2016 20:44:59 +0000 (12:44 -0800)]
[AWARE] Remove reason from discovery session terminate callback
Only valid reason is per request (destroy or timeout/count).
Bug:
32670068
Test: unit tests & integration tests (sl4a) passing
Change-Id: I85d417442e26a16d7f09d6d2d4cbb8ae7a9eba7e
Etan Cohen [Mon, 19 Dec 2016 23:54:51 +0000 (15:54 -0800)]
[AWARE] Simplify Wi-Fi Aware API namespace
Simplify Wi-fi Aware API namespace. Rely on project and remove WifiAware
prefix from most classes.
(pure rename operation: no functional changes)
Bug:
31470256
Test: unit-tests + integration (sl4a) tests.
Change-Id: I38b8137c1730c8f40c482c6770caafcaeafd5c46
Pavlin Radoslavov [Thu, 5 Jan 2017 18:46:08 +0000 (10:46 -0800)]
Add Bluetooth Codec selection UI to the Developer Options
Test: A2DP streaming to headsets and manual UI interaction
Bug:
30958229
Change-Id: I88f6efedf1c89b524c863543135ef7be9b7e1a7c
Alex Naidis [Tue, 3 Jan 2017 17:24:57 +0000 (18:24 +0100)]
DefaultPermissionGrantPolicy: Pass correct arguments
After parsing the xml files in the "default-permissions"
system, we are passing the arguments in the wrong order.
The method we are targeting is:
private void grantRuntimePermissionsLPw(PackageParser.Package pkg, Set<String> permissions,
boolean systemFixed, boolean isDefaultPhoneOrSms, int userId) {
However we are passing our argument for "systemFixed"
to "isDefaultPhoneOrSms" and the other way around too.
This patch fixes it by using the version of the method
which takes 4 arguments and sets "isDefaultPhoneOrSms"
as false.
Change-Id: I3604a5d6045aadcd91b6dd3f6f1b47b561403b23
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Peter Qiu [Thu, 15 Dec 2016 23:38:56 +0000 (15:38 -0800)]
wifi: hotspot2: Passpoint configuration APIs update
- renamed addPasspointConfiguration to addOrUpdatePasspointConfiguration
to match the implementation of the API
- updated getPasspointConfigurations to return an empty list instead of
a null when no configuration is installled
Bug:
33587910
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Id40185edb08910c01454c44b77957e2d5c0df722
Dan Albert [Fri, 6 Jan 2017 20:54:52 +0000 (20:54 +0000)]
Merge "Unversion NDK stub libraries."
am:
ddc7ac8ba6
Change-Id: I0cf382ae983796b948acfe84e1bb9b639de86a65
Treehugger Robot [Fri, 6 Jan 2017 20:44:18 +0000 (20:44 +0000)]
Merge "Unversion NDK stub libraries."
Dan Albert [Fri, 6 Jan 2017 00:01:14 +0000 (16:01 -0800)]
Unversion NDK stub libraries.
The system versions of these libraries aren't versioned yet.
Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I74e988be8f60f8728a0bfa7360091cbd9f5b1186
Ruchi Kandoi [Fri, 6 Jan 2017 18:58:17 +0000 (18:58 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
am:
cc4203221b
Change-Id: I4add3ce1cf3170aff887865302964b4425094692
Ruchi Kandoi [Fri, 6 Jan 2017 18:49:44 +0000 (18:49 +0000)]
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."