Commit Graph

277484 Commits

Author SHA1 Message Date
Paul Duffin
6ac5293751 Merge "Replace core-junit with junit" 2016-12-07 12:52:03 +00:00
Treehugger Robot
3af34c8e0a Merge "Handle IpReachabilityMonitor errors better." 2016-12-07 09:17:21 +00:00
Erik Kline
b406666cf5 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 e452660466)
2016-12-07 16:23:26 +09:00
Jeff Sharkey
3101778fb2 Merge "Move more installd methods to Binder." 2016-12-07 06:39:28 +00:00
Andreas Gampe
90e5fc0970 Merge "Workaround for javac compilation issue of lambda code" 2016-12-07 02:05:08 +00:00
Jeff Sharkey
019ac85ef5 Move more installd methods to Binder.
Test: builds, boots, apps install fine
Bug: 13758960, 30944031
Change-Id: Ic00968214cec03d67fff7964e5175ab9e6132b36
2016-12-06 18:52:20 -07:00
Mark Renouf
cc3fad3097 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 e065f7c5a9)

BUG: 32554459
Test: m
Change-Id: I189c8ef02dc93b46ef6418c1ff14f2312097898a
2016-12-06 17:45:34 -08:00
Treehugger Robot
68ea36243d Merge "Fix crashing StrictJarFile due to doubled closing." 2016-12-07 01:40:48 +00:00
Treehugger Robot
54710df28d Merge "Adding a new string array resource for network recommendations." 2016-12-07 01:17:16 +00:00
Stephen Chen
f1b75647a3 Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED.
Bug: 32913919
Test: n/a
Change-Id: Ied075bdcc1ebb8f0a4bc0d3bf9758fa6719ce0b9
2016-12-06 16:21:14 -08:00
Jeremy Joslin
ba825554bc 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
2016-12-06 16:19:12 -08:00
Bill Yi
82834baa35 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 2016-12-06 15:17:16 -08:00
Treehugger Robot
800a4e753e Merge "API for requesting network recommendations." 2016-12-06 23:08:03 +00:00
Jeff Sharkey
019867cb52 Merge "Move moveCompleteApp() to Binder." 2016-12-06 22:24:26 +00:00
Jeremy Joslin
d1daf6d22a 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
2016-12-06 12:48:30 -08:00
Jeff Sharkey
5b9b0db9f8 Merge "Move dump() to dumpAsync(), more oneway calls."
am: 5773d9702e  -s ours

Change-Id: Ifc71dfc411dfd8d4fc23b8e7f0843ee90607bb3b
2016-12-06 20:45:22 +00:00
Treehugger Robot
5773d9702e Merge "Move dump() to dumpAsync(), more oneway calls." 2016-12-06 20:15:28 +00:00
Stephen Chen
45fdf32038 Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
am: 70ae1bf4db

Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022
2016-12-06 19:20:24 +00:00
Treehugger Robot
70ae1bf4db Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." 2016-12-06 19:11:28 +00:00
Jeff Sharkey
b2c312a742 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
2016-12-06 19:08:34 +00:00
Jason Monk
f120cf3d88 resolve merge conflicts of 9600df0 to stage-aosp-master
Change-Id: I139c64bb2440d64312d7e763e53bdb13dcb9f1aa
2016-12-06 11:34:12 -05:00
Yifan Hong
1abe6def68 Merge "Check for nullptr when casting IBinder to IBase."
am: 5014028691

Change-Id: I4a3c320351a9afa305a40e3912cc2e968494497c
2016-12-06 15:39:02 +00:00
Jason Monk
9600df035b Merge "Fix Hotspot tile is shown on Guest user" 2016-12-06 15:11:19 +00:00
Treehugger Robot
5014028691 Merge "Check for nullptr when casting IBinder to IBase." 2016-12-06 15:08:40 +00:00
Paul Duffin
9249205d1b Replace core-junit with junit
Bug: 30188076
Test: make checkbuild
Change-Id: I0cb6f89907eb099714b54bac57b51c4be186c3e0
2016-12-06 14:32:41 +00:00
Yoshinori Hirano
7bccd43fa9 Don't include front most excluded task in Multi-Window mode
A front most excluded task is shown on Overview when changing font size
in Multi-Window mode. To fix this issue, RecentActivity should not reset
the config launch flags when it is restarted by configuration changes and
it should not reload the tasks which include a front most excluded task
when it is launched while docking a task.

Bug: 33031985
Test: manual - display app task excluded from Overview screen and then
               change font size in Multi-Window mode

Change-Id: Ic0c35cd06c14d9ed8d2dc46a01f2153738bad849
2016-12-06 19:48:21 +09:00
Jeff Sharkey
c8ddc2d56e 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
2016-12-05 23:41:04 -07:00
Tomasz Mikolajewski
b061fc2bb5 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
2016-12-06 10:05:05 +09:00
Stephen Chen
6a0c879de3 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
2016-12-05 17:01:57 -08:00
Jeff Sharkey
2ab7bff525 Merge "Initial Binder interface for installd."
am: 19fc36fa33

Change-Id: I22e910b705327eafa5c158ec43d6d86eb0b429d0
2016-12-06 00:23:56 +00:00
Jeff Sharkey
19fc36fa33 Merge "Initial Binder interface for installd." 2016-12-06 00:14:54 +00:00
Yifan Hong
b747440d2f Check for nullptr when casting IBinder to IBase.
Test: compiles

Bug: 33307202
Change-Id: I6ef880188e2f43766e52317244366b2fdd38c728
2016-12-05 13:10:13 -08:00
Jeff Sharkey
70b4d101fe 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
2016-12-05 11:47:21 -07:00
Etan Cohen
65617f21bf Merge "[AWARE] Fix javadocs for match filter update"
am: 7241d28826

Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823
2016-12-05 15:57:37 +00:00
Etan Cohen
7241d28826 Merge "[AWARE] Fix javadocs for match filter update" 2016-12-05 15:51:18 +00:00
ltrochtova
8058dc0e82 Merge "Introduce a new user restriction for disallowing Bluetooth."
am: 5fb37a7641  -s ours

Change-Id: Ib4a1173b40701562fc41738319371e126eba6c04
2016-12-05 15:44:06 +00:00
ltrochtova
5fb37a7641 Merge "Introduce a new user restriction for disallowing Bluetooth." 2016-12-05 15:35:22 +00:00
Lenka Trochtova
13a0519394 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
2016-12-05 11:53:34 +01:00
Lenka Trochtova
f15cf38311 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
2016-12-05 10:46:58 +01:00
Tobias Thierer
6e2d3fa82f Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
am: 1e498a96c1

Change-Id: I28b8deadc9386b8772bd94870809213fdddad7e6
2016-12-05 09:35:10 +00:00
Tobias Thierer
1e498a96c1 Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" 2016-12-05 09:28:47 +00:00
Sungsoo Lim
582e612fdc Merge "ExifInterface: fix NegativeArraySizeException"
am: c57b472d67

Change-Id: Ifbe9af9b62837923e6e56159759da6c59795b3aa
2016-12-05 04:41:30 +00:00
Sungsoo Lim
c57b472d67 Merge "ExifInterface: fix NegativeArraySizeException" 2016-12-05 04:35:19 +00:00
Yifan Hong
dab9e7bfc7 Merge "Use IBase instead of IBinder for IServiceManager."
am: 8ead2f0c9a

Change-Id: Ia18426c336f1ba9c9bceb57db0222ba6c59667a9
2016-12-03 23:10:08 +00:00
Treehugger Robot
8ead2f0c9a Merge "Use IBase instead of IBinder for IServiceManager." 2016-12-03 23:04:26 +00:00
Sergey Yakovlev
3a1cf2281b Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)"
am: 41f14f47a5

Change-Id: I476bab68c662809bd998f0334441fdd31f6c940a
2016-12-03 04:19:44 +00:00
Roshan Pius
33aa9ce35d Merge changes from topic 'fast-bss-transition'
am: f301986727

Change-Id: I0b0334f193120d379031d9790d68bc2840254391
2016-12-03 04:18:00 +00:00
Paul Stewart
4120c55379 Add capability flag for 802.11r fast BSS transition
am: 07f4d23a88

Change-Id: Ife9a8e1342b6b090dec749cf505fd3091ff33f89
2016-12-03 04:17:49 +00:00
Paul Stewart
1fd6f643ac Add constants for 802.11r
am: e72f7dc385

Change-Id: I06d93c3ce96cddd6447b340304ce9fec2d4e41f2
2016-12-03 04:16:58 +00:00
Stephen Chen
d738140b8d Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
am: d758ce1586

Change-Id: I1bf1effbb635d57980728555587e8056f630edb9
2016-12-03 04:16:06 +00:00