OSDN Git Service
Hugo Benichi [Thu, 13 Oct 2016 00:26:01 +0000 (09:26 +0900)]
DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters
This patch adds a getUint8 getter for ByteBuffers and changes ApfFilter
to make uses of getUint8/16/32 everywhere.
The return types of getUint16 is also changed from long to int, which
will expand gracefully to long as an unsigned int as it is guaranteed to
be positive after getUint16.
Test: ApfTest passes
(cherry picked from commit
995dd94673005b43d32456e2de5fda0090b23576)
Change-Id: I606ebc5aedfcacde400d27cc6bc37145769b122c
Hugo Benichi [Thu, 6 Oct 2016 06:19:36 +0000 (15:19 +0900)]
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
Test: added new unit tests
(cherry picked from commit
8acea76a2b7555b3bd5ca1170cca9d09e979fafc)
Change-Id: I847d7e4895766042043c0bba1c9b9a698a705d87
Erik Kline [Wed, 25 Nov 2015 03:49:38 +0000 (12:49 +0900)]
DO NOT MERGE: Support timeouts for requestNetwork() invocations.
(cherry-pick of
06c3ef1367e850746eef0a5462bdce8674d74c30)
(cherry picked from commit
57faba9ec73fbb311d5ca1df3278aee9728589d5)
Bug:
21414325
Change-Id: I1a58823a372154589f972b98c4c428eab0e0523e
Pierre Imai [Mon, 8 Feb 2016 07:01:40 +0000 (16:01 +0900)]
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is
specified for a given network.
Bug:
10705136
(cherry picked from commit
54f0d9edbf7f6ea6dd805dc77fdbf2c3848188e2)
Change-Id: I89e2fdfbbfa981d435a2974422d9d9c009872d76
Treehugger Robot [Wed, 7 Dec 2016 09:17:21 +0000 (09:17 +0000)]
Merge "Handle IpReachabilityMonitor errors better."
Erik Kline [Fri, 14 Oct 2016 09:33:22 +0000 (18:33 +0900)]
Handle IpReachabilityMonitor errors better.
If construction of a new IpReachabilityMonitor throws an IAE then
log it and immediately call onProvisioningFailure().
Test: runtest frameworks-wifi
passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()
which fails with an NPE for unrelated reasons.
Bug:
31038971
Bug:
31742703
Change-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c
(cherry picked from commit
e4526604664cb66ecdcbeca4d8f64e8c94750c31)
Jeff Sharkey [Wed, 7 Dec 2016 06:39:27 +0000 (06:39 +0000)]
Merge "Move more installd methods to Binder."
Andreas Gampe [Wed, 7 Dec 2016 02:05:08 +0000 (02:05 +0000)]
Merge "Workaround for javac compilation issue of lambda code"
Jeff Sharkey [Tue, 6 Dec 2016 06:39:46 +0000 (23:39 -0700)]
Move more installd methods to Binder.
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: Ic00968214cec03d67fff7964e5175ab9e6132b36
Mark Renouf [Tue, 1 Nov 2016 15:48:24 +0000 (11:48 -0400)]
Workaround for javac compilation issue of lambda code
Since ag/
32554459 some Robolectric tests are compiling
framework code with javac. For reasons unclear so far this
code fails to compile with javac:
> ShortcutService.java:408: error: variable ri might not have been initialized
https://android-build.googleplex.com/builds/submitted/
3416256/angelfish-userdebug/latest/logs
Removing the lambda expressions corrects the issue.
(cherry picked from commit
e065f7c5a9ad4e47f5490793401445660af37624)
BUG:
32554459
Test: m
Change-Id: I189c8ef02dc93b46ef6418c1ff14f2312097898a
Treehugger Robot [Wed, 7 Dec 2016 01:40:48 +0000 (01:40 +0000)]
Merge "Fix crashing StrictJarFile due to doubled closing."
Treehugger Robot [Wed, 7 Dec 2016 01:17:16 +0000 (01:17 +0000)]
Merge "Adding a new string array resource for network recommendations."
Jeremy Joslin [Thu, 1 Dec 2016 00:44:11 +0000 (16:44 -0800)]
Adding a new string array resource for network recommendations.
The new resource allows for multiple package names to be specified
in priority order.
Test: Nothing to test.
BUG:
33158362
Merged-In: I4a066d9220c723a17dd11e2566161fade6bb471b
Merged-In: Ifed73e493fe7de64b3dd051a53d16d39da1e4eef
Change-Id: I26ac87a49ae94dd0763173af5c8a2c6abe7cb5f8
Bill Yi [Tue, 6 Dec 2016 23:17:16 +0000 (15:17 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Treehugger Robot [Tue, 6 Dec 2016 23:08:02 +0000 (23:08 +0000)]
Merge "API for requesting network recommendations."
Jeff Sharkey [Tue, 6 Dec 2016 22:24:25 +0000 (22:24 +0000)]
Merge "Move moveCompleteApp() to Binder."
Jeremy Joslin [Tue, 29 Nov 2016 01:47:35 +0000 (17:47 -0800)]
API for requesting network recommendations.
Defining a new system API that will allow the system to request
network recommendations from a NetworkScoreService implementation.
Test: Coming in a future CL.
BUG:
32909424
Merged-In: I2d5c0a843b928b04e87c1862a78702a02fd54c31
Change-Id: Idd33095c6cd2f5b391796c900399f18a2c40fcc3
Jeff Sharkey [Tue, 6 Dec 2016 20:45:22 +0000 (20:45 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls."
am:
5773d9702e -s ours
Change-Id: Ifc71dfc411dfd8d4fc23b8e7f0843ee90607bb3b
Treehugger Robot [Tue, 6 Dec 2016 20:15:27 +0000 (20:15 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls."
Stephen Chen [Tue, 6 Dec 2016 19:20:24 +0000 (19:20 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
am:
70ae1bf4db
Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022
Treehugger Robot [Tue, 6 Dec 2016 19:11:28 +0000 (19:11 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
Jeff Sharkey [Wed, 9 Nov 2016 19:25:44 +0000 (12:25 -0700)]
Move dump() to dumpAsync(), more oneway calls.
When calling out to dump services hosted by external apps, use
dumpAsync() to avoid hanging if the remote process is wedged.
Test: builds, boots, runs with minimal logs triggered
Bug:
32715088
Change-Id: I70aa2666ae21dae8f09ded2063bed359c0b210c5
Merged-In: I70aa2666ae21dae8f09ded2063bed359c0b210c5
Jason Monk [Tue, 6 Dec 2016 16:34:12 +0000 (11:34 -0500)]
resolve merge conflicts of
9600df0 to stage-aosp-master
Change-Id: I139c64bb2440d64312d7e763e53bdb13dcb9f1aa
Yifan Hong [Tue, 6 Dec 2016 15:39:02 +0000 (15:39 +0000)]
Merge "Check for nullptr when casting IBinder to IBase."
am:
5014028691
Change-Id: I4a3c320351a9afa305a40e3912cc2e968494497c
Jason Monk [Tue, 6 Dec 2016 15:11:18 +0000 (15:11 +0000)]
Merge "Fix Hotspot tile is shown on Guest user"
Treehugger Robot [Tue, 6 Dec 2016 15:08:39 +0000 (15:08 +0000)]
Merge "Check for nullptr when casting IBinder to IBase."
Jeff Sharkey [Tue, 6 Dec 2016 06:14:41 +0000 (23:14 -0700)]
Move moveCompleteApp() to Binder.
Also start manually checking thread-locking, since Binder methods
don't funnel through the old transact().
Test: builds, boots, apps install fine
Bug:
13758960,
30944031
Change-Id: I661eade7dc8e060689ecbcb9b6d19528e5c4ca66
Tomasz Mikolajewski [Tue, 6 Dec 2016 01:05:05 +0000 (10:05 +0900)]
Fix crashing StrictJarFile due to doubled closing.
If the constuctor throws, then the handles would be closed without
setting "closed" to true. As a result, the finalizer would close
the handles again, which would cause a crash on the native side.
Test: Unit tests are no longer flaky.
Bug:
33301253
Change-Id: I527ba38d5d65ce844258d894441d4fe16bac6e23
Stephen Chen [Wed, 16 Nov 2016 23:46:51 +0000 (15:46 -0800)]
Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag.
This flag enables the NetworkScoreService.requestRecommendations API,
defined in b/
32909424.
Bug:
32913919
Bug:
32909424
Test: runtest --path
frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java
Change-Id: If592e4a2ec574929aa0c829c39ad4ce9b0317805
Jeff Sharkey [Tue, 6 Dec 2016 00:23:56 +0000 (00:23 +0000)]
Merge "Initial Binder interface for installd."
am:
19fc36fa33
Change-Id: I22e910b705327eafa5c158ec43d6d86eb0b429d0
Jeff Sharkey [Tue, 6 Dec 2016 00:14:53 +0000 (00:14 +0000)]
Merge "Initial Binder interface for installd."
Yifan Hong [Mon, 5 Dec 2016 21:10:13 +0000 (13:10 -0800)]
Check for nullptr when casting IBinder to IBase.
Test: compiles
Bug:
33307202
Change-Id: I6ef880188e2f43766e52317244366b2fdd38c728
Jeff Sharkey [Mon, 5 Dec 2016 18:19:28 +0000 (11:19 -0700)]
Initial Binder interface for installd.
Start using new installd Binder interface, with a quick-disable
switch if something breaks.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: Ia6e55d49595c96ae928aefc8a6606ee690e58764
Etan Cohen [Mon, 5 Dec 2016 15:57:37 +0000 (15:57 +0000)]
Merge "[AWARE] Fix javadocs for match filter update"
am:
7241d28826
Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823
Etan Cohen [Mon, 5 Dec 2016 15:51:17 +0000 (15:51 +0000)]
Merge "[AWARE] Fix javadocs for match filter update"
ltrochtova [Mon, 5 Dec 2016 15:44:06 +0000 (15:44 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
am:
5fb37a7641 -s ours
Change-Id: Ib4a1173b40701562fc41738319371e126eba6c04
ltrochtova [Mon, 5 Dec 2016 15:35:21 +0000 (15:35 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
Lenka Trochtova [Fri, 2 Dec 2016 11:19:39 +0000 (12:19 +0100)]
Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895300
Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Lenka Trochtova [Fri, 2 Dec 2016 11:19:39 +0000 (12:19 +0100)]
Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895300
Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Tobias Thierer [Mon, 5 Dec 2016 09:35:10 +0000 (09:35 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
am:
1e498a96c1
Change-Id: I28b8deadc9386b8772bd94870809213fdddad7e6
Tobias Thierer [Mon, 5 Dec 2016 09:28:46 +0000 (09:28 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
Sungsoo Lim [Mon, 5 Dec 2016 04:41:30 +0000 (04:41 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException"
am:
c57b472d67
Change-Id: Ifbe9af9b62837923e6e56159759da6c59795b3aa
Sungsoo Lim [Mon, 5 Dec 2016 04:35:17 +0000 (04:35 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException"
Yifan Hong [Sat, 3 Dec 2016 23:10:08 +0000 (23:10 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager."
am:
8ead2f0c9a
Change-Id: Ia18426c336f1ba9c9bceb57db0222ba6c59667a9
Treehugger Robot [Sat, 3 Dec 2016 23:04:24 +0000 (23:04 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager."
Sergey Yakovlev [Sat, 3 Dec 2016 04:19:44 +0000 (04:19 +0000)]
Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)"
am:
41f14f47a5
Change-Id: I476bab68c662809bd998f0334441fdd31f6c940a
Roshan Pius [Sat, 3 Dec 2016 04:18:00 +0000 (04:18 +0000)]
Merge changes from topic 'fast-bss-transition'
am:
f301986727
Change-Id: I0b0334f193120d379031d9790d68bc2840254391
Paul Stewart [Sat, 3 Dec 2016 04:17:49 +0000 (04:17 +0000)]
Add capability flag for 802.11r fast BSS transition
am:
07f4d23a88
Change-Id: Ife9a8e1342b6b090dec749cf505fd3091ff33f89
Paul Stewart [Sat, 3 Dec 2016 04:16:58 +0000 (04:16 +0000)]
Add constants for 802.11r
am:
e72f7dc385
Change-Id: I06d93c3ce96cddd6447b340304ce9fec2d4e41f2
Stephen Chen [Sat, 3 Dec 2016 04:16:06 +0000 (04:16 +0000)]
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
am:
d758ce1586
Change-Id: I1bf1effbb635d57980728555587e8056f630edb9
Colin Cross [Sat, 3 Dec 2016 04:14:58 +0000 (04:14 +0000)]
Merge "Convert libandroidfw to Android.bp"
am:
46ec8dba83
Change-Id: I32a737c491eeb95ad080adacd47602ee814ba0cb
Treehugger Robot [Sat, 3 Dec 2016 03:53:17 +0000 (03:53 +0000)]
Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)"
Roshan Pius [Fri, 2 Dec 2016 23:57:39 +0000 (23:57 +0000)]
Merge changes from topic 'fast-bss-transition'
* changes:
Add capability flag for 802.11r fast BSS transition
Add constants for 802.11r
Treehugger Robot [Fri, 2 Dec 2016 23:41:36 +0000 (23:41 +0000)]
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
Treehugger Robot [Fri, 2 Dec 2016 23:16:48 +0000 (23:16 +0000)]
Merge "Convert libandroidfw to Android.bp"
Chris Tate [Fri, 2 Dec 2016 22:45:47 +0000 (22:45 +0000)]
Merge "Fix the deadlock problem"
am:
fa228e06f6
Change-Id: I862d3cedcf38c81f22559439aa8f00ac2ab3cca3
Chris Tate [Fri, 2 Dec 2016 22:39:57 +0000 (22:39 +0000)]
Merge "Fix the deadlock problem"
Jaekyun Seok [Fri, 2 Dec 2016 19:35:03 +0000 (19:35 +0000)]
Merge "Remove static link in Android framework under /frameworks/base."
am:
c60963e451
Change-Id: I0bbb3cf9a66752f6ee8218a4ac5545091130bbed
Colin Cross [Thu, 1 Dec 2016 23:55:00 +0000 (15:55 -0800)]
Convert libandroidfw to Android.bp
See build/soong/README.md for more information.
Test: libandroidfw_tests
Merged-In: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
Change-Id: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
(cherry picked from commit
4f8d9e69eb63878a99abedfdc7b92c6284f30605)
Treehugger Robot [Fri, 2 Dec 2016 19:21:46 +0000 (19:21 +0000)]
Merge "Remove static link in Android framework under /frameworks/base."
Robert Sesek [Fri, 2 Dec 2016 17:15:23 +0000 (17:15 +0000)]
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
am:
eda1af611f
Change-Id: I539fb728175c109a93cbff7d8929b584e88bb70c
Treehugger Robot [Fri, 2 Dec 2016 17:02:31 +0000 (17:02 +0000)]
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
Tobias Thierer [Thu, 1 Dec 2016 23:04:36 +0000 (23:04 +0000)]
Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64
Previously, they weres using libcore.io.Base64, which is @deprecated.
The two implementations' encoders produce the exact same result.
The two implementations' decoders' behavior differs for malformed
input:
- In case of error, libcore.io.Base64.decode() returns null while
java.util.Base64.getDecoder().decode() throws.
- java.util.Base64 tends to be stricter about rejecting malformed
input; specifically, it allows neither whitespace nor unexpected
'=' characters (should only occur in the padding) whereas
libcore.io.Base64.decode() leniently allows them throughout the
input.
- if the input terminates prematurely, libcore.io.Base64 tends to
return fewer bytes (stops at a four byte boundary).
The behavior differences for malformed Base64 encoded data should
not affect ShortcutPackageInfo because it should only need to deal
with XML attribute values written by itself, which are well-formed.
Note that this CL does not lead to any known changes of the encoding
step, so values written by earlier versions should not cause problems
when read by later versions of ShortcutPackageInfo.
StrictJarVerifier may now reject or behave differently for .jar /
.zip files with malformed attribute values but this seems okay since,
per its name, it is meant to be strict. For example, after this CL,
StrictJarVerifier will no longer accept algorithm + "-Digest"
attribute values with extra whitespace or padding characters as valid.
Test: Confirmed that the two implementations' encoders produce the
same result by running the following code just before this CL:
assertEquals(
libcore.io.Base64.encode(allBytes()),
Base64.getEncoder().encodeToString(allBytes()));
where allBytes() returns a byte[] with values (byte) 0 .. (byte) 255
Test: Test that phone still boots after flashing code that includes
this CL.
Test: CtsLibcoreTestCases
Bug:
31292683
Change-Id: I775d32f329f693514a8f14d87e1ef0d7a757e6c3
NIEJuhu [Fri, 4 Nov 2016 09:13:13 +0000 (17:13 +0800)]
ExifInterface: fix NegativeArraySizeException
The IFD entry has a 4-byte field COUNT. It is read as int type
and is used as array size by ExifInterface. If a crafted JPEG
file contains a negative value, a NegativeArraySizeException
occurs.
Change-Id: Ief29936400f04636928df09e7f357cbf25345383
Signed-off-by: NIEJuhu <niejuhu@xiaomi.com>
Jack He [Fri, 2 Dec 2016 04:49:39 +0000 (04:49 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
am:
7dd909684f
Change-Id: Ib90b23ef7b4271e2adc8a3c66963aaeb5c70a66f
Treehugger Robot [Fri, 2 Dec 2016 04:37:47 +0000 (04:37 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
Mark Salyzyn [Fri, 2 Dec 2016 03:44:33 +0000 (03:44 +0000)]
Merge "jni: EventLog replace open coding with android_log_event_list"
am:
1981812450
Change-Id: Ia6a4daf5b90ef20d227e06c9322a84ed7d3bb8aa
Robert Greenwalt [Fri, 2 Dec 2016 03:39:30 +0000 (03:39 +0000)]
Merge "Get the correct operator name"
am:
297e9f9a32
Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5
Jack He [Thu, 1 Dec 2016 00:28:53 +0000 (16:28 -0800)]
Protect broadcast emitted by Bluetooth mapmce and pbap profile
Bug:
33281228
Test: mm -j 40
Change-Id: I273e9e3c02f431ba7006bcf5d230a6c30eb67843
Etan Cohen [Fri, 2 Dec 2016 00:59:41 +0000 (16:59 -0800)]
[AWARE] Fix javadocs for match filter update
Javadocs update. Specifically, cannot contain generics (since
under-the-hood generics are just the undecorated class).
Bug:
32840891
Test: generated docs (no functional change)
Change-Id: I4bc2967a60ad27d137fd5a4dd3db18625343c910
Treehugger Robot [Fri, 2 Dec 2016 00:39:55 +0000 (00:39 +0000)]
Merge "jni: EventLog replace open coding with android_log_event_list"
Robert Greenwalt [Thu, 1 Dec 2016 23:29:28 +0000 (23:29 +0000)]
Merge "Get the correct operator name"
Zoran Jovanovic [Wed, 2 Nov 2016 08:56:38 +0000 (09:56 +0100)]
Get the correct operator name
If the long operator name is not given by RIL,
try to get the short operator name.
Bug:
32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
ltrochtova [Thu, 1 Dec 2016 21:48:07 +0000 (21:48 +0000)]
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
am:
4eb075e89f -s ours
Change-Id: Ibcc0b6db64260f444c5884ce9df39395d59a6158
Michael Rosenfeld [Thu, 1 Dec 2016 21:40:06 +0000 (21:40 +0000)]
Merge "Add command line action sequencing."
am:
880c9acf4a
Change-Id: I81b31d950e0dca525fbfe9aa38c9c113eea7cec8
Etan Cohen [Thu, 1 Dec 2016 21:35:05 +0000 (21:35 +0000)]
Merge "AWARE: Abstract structure of match filters"
am:
f358a69cba
Change-Id: Ic7e87e47e9a9beebb11aa7465e4d2be9dd3e767a
ltrochtova [Thu, 1 Dec 2016 21:31:23 +0000 (21:31 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
am:
1e9a5eac92 -s ours
Change-Id: I35d19d46b8edbacb66613e11a398c742f9d37029
ltrochtova [Thu, 1 Dec 2016 21:20:42 +0000 (21:20 +0000)]
Merge "Revert "Introduce a new user restriction for disallowing Bluetooth.""
ltrochtova [Thu, 1 Dec 2016 20:50:53 +0000 (20:50 +0000)]
Revert "Introduce a new user restriction for disallowing Bluetooth."
This reverts commit
69f9d321ac19e7137e07b411779339f9973eba1b.
Change-Id: I5859b262a741d1fe8e8b61e142eecf7d742d8d41
Yifan Hong [Thu, 1 Dec 2016 18:25:05 +0000 (10:25 -0800)]
Use IBase instead of IBinder for IServiceManager.
Test: compiles with mma
Change-Id: I5805df48aa358dcef555125f6467d659f095b0c2
Treehugger Robot [Thu, 1 Dec 2016 17:23:37 +0000 (17:23 +0000)]
Merge "Add command line action sequencing."
Etan Cohen [Thu, 1 Dec 2016 15:42:34 +0000 (15:42 +0000)]
Merge "AWARE: Abstract structure of match filters"
ltrochtova [Thu, 1 Dec 2016 13:40:28 +0000 (13:40 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
Lenka Trochtova [Thu, 24 Nov 2016 15:48:37 +0000 (16:48 +0100)]
Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on
the entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895300
Change-Id: Iae77647b1e48be6b8efbeccdff6a3d468a0e174d
Stephen Chen [Thu, 1 Dec 2016 03:23:32 +0000 (03:23 +0000)]
Merge "Add meteredOverride field to WifiConfiguration."
am:
f9479fe639
Change-Id: I0d2540cf0a360f07c1dd103191fd348602099ff5
Treehugger Robot [Thu, 1 Dec 2016 03:08:44 +0000 (03:08 +0000)]
Merge "Add meteredOverride field to WifiConfiguration."
Andreas Gampe [Thu, 1 Dec 2016 02:48:18 +0000 (02:48 +0000)]
Merge "App_process: Merge app_process and app_process__asan"
am:
de32925ccd
Change-Id: I86aaea459fdc1283a3b7e2f0b035ad26aef98920
Treehugger Robot [Thu, 1 Dec 2016 02:38:29 +0000 (02:38 +0000)]
Merge "App_process: Merge app_process and app_process__asan"
Stephen Chen [Wed, 16 Nov 2016 23:46:51 +0000 (15:46 -0800)]
Add Settings.Global.WIFI_WAKEUP_ENABLED flag.
Set the flag default to false. This addition is for the
Android Wi-Fi Snooze project:
https://docs.google.com/document/d/1zewDZ6Ne-qH7zKFDtcSx55f9jPauZwT5VvOs1uVNXf8/edit#
Bug:
32920000
Bug:
32913119
Test: runtest --path
frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java
Change-Id: I597d5dd643e8044315cc6d7553ae5740485a0552
Amin Shaikh [Thu, 1 Dec 2016 02:10:55 +0000 (02:10 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
am:
3af97482f1
Change-Id: I99537b7841021704c162db6b8fe3d472ede1e991
pengzhicai [Tue, 29 Nov 2016 11:01:44 +0000 (19:01 +0800)]
Fix the deadlock problem
https://code.google.com/p/android/issues/detail?id=229020
Change-Id: Ib08f62dd916d09e666e58fb583555170d1e51da6
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
Treehugger Robot [Thu, 1 Dec 2016 01:59:13 +0000 (01:59 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
Jaekyun Seok [Wed, 23 Nov 2016 07:28:34 +0000 (16:28 +0900)]
Remove static link in Android framework under /frameworks/base.
The dependencies to static libraries in frameworks should be removed
as many as possible to reduce a size of the system partition.
And that will improve coverage of the VNDK libraries because this
effort might find new necessary shared libs which were linked
statically before.
Size diffs of libs in /system/lib on angler-userdebug build are as
following.
libandroidfw.so : 243748 -> 205196 (-38552)
libhwui.so : 562028 -> 562580 (+552)
libmedia_jni.so : 293652 -> 293656 (+4)
(All the others have the same size.)
total: (-37996)
Test: building succeeded, and the image was tested on angler.
Bug:
33056637
Change-Id: I3021fb438778eaea2be935b990ec85c4aec6c008
(cherry picked from commit
2b14c5eaf61635d1c3a69a2e59faa23cb6b7f7cb)
Etan Cohen [Wed, 23 Nov 2016 19:11:23 +0000 (11:11 -0800)]
AWARE: Abstract structure of match filters
Replace byte[] representation with a List<byte[]> representation
which abstracts the LV (TLV without a type field) structure of
the match filters.
Tlv utilities: remove tag indicating that will be made public API.
That is no longer expected (will be an internal utility) since the
match filter structure is now parsed when exposed to API.
Lv utilities: removed. Was a simple wrapper around Tlv utilities -
no longer needed since will not be exposed as API.
(cherry-pick of commit
c9870d0d431471bf1362e46fc4f2f1bc6722896a)
Bug:
32840891
Test: unit-tests and integration (sl4a) tests passing
Change-Id: I6d792c4d7584ce002f6c11692e83e7654ef3e764
Andreas Gampe [Thu, 1 Dec 2016 00:35:32 +0000 (16:35 -0800)]
App_process: Merge app_process and app_process__asan
Two birds with one stone: simplify the setup (including the modules
required in PRODUCT_PACKAGES) and work around a build system issue
wrt/ sanitized static libraries.
Bug:
33224213
Test: mmma frameworks/base/cmds/app_process && \
mmma SANITIZE_TARGET=address SANITIZE_LITE=true \
frameworks/base/cmds/app_process && \
ls $OUT/system/bin/asanwrapper && \
readelf -s $OUT/system/bin/app_process32 | grep asan && \
readelf -s $OUT/system/bin/asan/app_process32 | grep asan && \
Change-Id: Ieff0ea9a2209cf74cf06f813087b55cb0bcc3896
Andreas Gampe [Thu, 1 Dec 2016 00:09:00 +0000 (00:09 +0000)]
Merge "App_process: Clean up sanitized binaries"
am:
273adb5257
Change-Id: I83ec3dd0ad23844cc9ba3420bc43b9b8deb3d1ca
Glenn Kasten [Thu, 1 Dec 2016 00:06:49 +0000 (00:06 +0000)]
Merge "LOCAL_CLANG := true is now the default"
am:
1204e3806f
Change-Id: Id579bdea109bca2056cea6c0359e18b120801bf4
Stephen Chen [Thu, 1 Dec 2016 00:02:58 +0000 (00:02 +0000)]
Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."
am:
6e54c31f0a
Change-Id: Ie3b4a3ed5e2858ce2b3446c300c984875201205c
Robert Greenwalt [Thu, 1 Dec 2016 00:01:04 +0000 (00:01 +0000)]
Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
am:
fbb48bcecd
Change-Id: I7a1c9a20e5f4f9f051926294650fcf9d486d4703
nharold [Thu, 1 Dec 2016 00:00:09 +0000 (00:00 +0000)]
Merge "Expose GSM Timing Advance, Update LTE TA docstring"
am:
4134ccb214
Change-Id: Ic60953cebd3209b1320ed4b6723809d0421ebc27