Commit Graph

62171 Commits

Author SHA1 Message Date
Jakub Pawlowski
0debe3c5b7 Merge "Bluetooth: report proper advertiser status on error" am: b509957e62 am: 673c0e5596
am: e8ceb15b51

Change-Id: I21eb000be58fd61b238e2401cf266b6f132acc83
2016-11-23 02:08:12 +00:00
Jakub Pawlowski
e8ceb15b51 Merge "Bluetooth: report proper advertiser status on error" am: b509957e62
am: 673c0e5596

Change-Id: Ic91b1c614e9cc71e7d57bd39ac31ec1127f08f65
2016-11-23 02:03:13 +00:00
Jakub Pawlowski
673c0e5596 Merge "Bluetooth: report proper advertiser status on error"
am: b509957e62

Change-Id: I1bb0a029a9044c3931e158c7ef02ffee4cb0f1cd
2016-11-23 01:58:03 +00:00
Jakub Pawlowski
76f517a173 Bluetooth: report proper advertiser status on error
When advertiser is not started because too many advertisers are
registered, return proper error code.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I57384ff30132e9a7ee17dcf191ff89baa7abf1ef
2016-11-22 13:38:15 -08:00
Martijn Coenen
d42b1d01ca Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f am: 8c05ff96fb
am: 201cf4fb27

Change-Id: Ibd379f588dacbf571948d34d76abb0e6f12f3a79
2016-11-22 10:00:36 +00:00
Martijn Coenen
201cf4fb27 Merge "Add SystemProperties.reportSyspropChanged()." am: 45c0c6939f
am: 8c05ff96fb

Change-Id: Ib406f48dc35ecededd89ed8ed8750622a26d9ee2
2016-11-22 09:55:03 +00:00
Martijn Coenen
8c05ff96fb Merge "Add SystemProperties.reportSyspropChanged()."
am: 45c0c6939f

Change-Id: I83890872ba76161cf2f9a35b23861ab21b452a0f
2016-11-22 09:49:15 +00:00
Treehugger Robot
45c0c6939f Merge "Add SystemProperties.reportSyspropChanged()." 2016-11-22 09:43:23 +00:00
Jeff Sharkey
55727aaede Merge "StrictMode to detect untagged network traffic." am: 67fe28d925 am: db5ed5beb1
am: 3391f3376e

Change-Id: I942f9c44a8c3b1abf39694816a34790df3e224ad
2016-11-21 21:58:02 +00:00
Jeff Sharkey
3391f3376e Merge "StrictMode to detect untagged network traffic." am: 67fe28d925
am: db5ed5beb1

Change-Id: Id6ce5cfedab250f25c0eb8b0c49971e9e20cbeb2
2016-11-21 21:48:31 +00:00
Jeff Sharkey
db5ed5beb1 Merge "StrictMode to detect untagged network traffic."
am: 67fe28d925

Change-Id: I52cdce87d87ec503294e431c8f22e87235bdbf79
2016-11-21 21:43:58 +00:00
Treehugger Robot
67fe28d925 Merge "StrictMode to detect untagged network traffic." 2016-11-21 21:33:15 +00:00
Jeff Sharkey
8984897502 Merge "Stub Binder API." am: 4db1632b3a am: 313456c975
am: c61a8e01a3

Change-Id: Id40456a710ce24f1af98b8e70a894a1fbe8d0690
2016-11-21 20:31:28 +00:00
Jeff Sharkey
c61a8e01a3 Merge "Stub Binder API." am: 4db1632b3a
am: 313456c975

Change-Id: Icc2db98a8ab325ca4bc7456abe5963c293a878cb
2016-11-21 20:26:22 +00:00
Jeff Sharkey
313456c975 Merge "Stub Binder API."
am: 4db1632b3a

Change-Id: I00e7f39d525a1d6af9a07b192294060113a2f7c2
2016-11-21 20:21:25 +00:00
Jeff Sharkey
4db1632b3a Merge "Stub Binder API." 2016-11-21 20:10:29 +00:00
Jeff Sharkey
763a140796 StrictMode to detect untagged network traffic.
Define some constants for early use in AOSP code.

Test: builds, boots, all common traffic tagged
Bug: 30943431
Change-Id: Ia58a8933bccfddbc027afb78c63ae65bd71ce562
2016-11-21 12:15:16 -07:00
Nancy Zheng
2a12d8520e Fix createConfirmDeviceCredentialIntent for wear for CTS. am: 43f166dfb4
am: a2193c0b76

Change-Id: I9f216231ff600972e3ddec195158fc2489693a1e
2016-11-21 18:25:12 +00:00
Nancy Zheng
a2193c0b76 Fix createConfirmDeviceCredentialIntent for wear for CTS.
am: 43f166dfb4

Change-Id: Icda6d5182ff20c4db150ae3f0351e559682184de
2016-11-21 18:19:48 +00:00
Jeff Sharkey
1324531355 Stub Binder API.
Provide a stub API for AOSP code to call.

Test: builds
Bug: 32715088
Change-Id: Iab74d269e795a722e82fd3fa304200d57d152f57
2016-11-21 18:11:25 +00:00
Martijn Coenen
0754b27b56 Add SystemProperties.reportSyspropChanged().
To support notifying libutils of system property
changes.

Bug: 31262344
Test: builds
Change-Id: Iea77532eaa84d00f7d640edd1e3a1da66afdadc5
2016-11-21 17:57:13 +00:00
Torne (Richard Coles)
7e17c6b0f1 Merge "Precreate the classloader for the WebView." am: 566b1c80e4 am: 1feb782f01
am: 9565860b08

Change-Id: I070288a127cbaa08f05b49f66e23ea0ec298040b
2016-11-21 17:13:45 +00:00
Torne (Richard Coles)
9565860b08 Merge "Precreate the classloader for the WebView." am: 566b1c80e4
am: 1feb782f01

Change-Id: Iec0bf848e4c25afc6a6b9ee83339a03f314adee9
2016-11-21 17:08:46 +00:00
Torne (Richard Coles)
1feb782f01 Merge "Precreate the classloader for the WebView."
am: 566b1c80e4

Change-Id: Ic79079748dae515cb8d89ef99148755ac65f1d47
2016-11-21 17:04:22 +00:00
Treehugger Robot
566b1c80e4 Merge "Precreate the classloader for the WebView." 2016-11-21 16:54:53 +00:00
Torne (Richard Coles)
3b6ca99b10 Precreate the classloader for the WebView.
We want to create the classloader for the WebView in advance in the
zygote so that it can preload Java and native code for its children, but
the zygote can't talk to the package manager (so doesn't have a
PackageInfo for the APK) and also doesn't have an ActivityThread, so
constructing a LoadedApk is difficult.

Instead, we use the fact that ApplicationLoaders contains a
process-global cache of classloaders for APKs, and prepopulate a cache
entry without constructing a LoadedApk. This requires making
ApplicationLoaders public. To calculate the correct library paths from
the information the zygote has, we reuse the logic in LoadedApk (which
is already public, and just needs a small change to allow a null
ActivityThread when checking for instrumentation).

The other parameters for classloader creation (target SDK, bundled app,
etc) are hardcoded to usable values for the WebView's case. WebView
never needs to use any system libraries that aren't public so claiming
it's not bundled is fine even when that isn't actually true, and WebView
will always target the current platform API level.

Once the classloader is created, look up the factory class and call
preloadInZygote on it to give it a chance to preload the native library
and do other shared initialisation.

Bug: 21643067
Test: enable multiprocess WebView, examine librank output to see sharing
Change-Id: I696ead637e3f7382bcc58cfaf61eac5921862015
2016-11-21 15:04:13 +00:00
Nancy Zheng
43f166dfb4 Fix createConfirmDeviceCredentialIntent for wear for CTS.
Bug: 33000237
Change-Id: I1fdb5a518c41ab005f12d3142763e374b38d7553
2016-11-18 18:15:09 -08:00
Jerry Zhang
54f33d9af2 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 am: 5cbd151d40
am: fb4a03c8f8

Change-Id: Ibdcd5074ceb48457227319f0869c6cbc62045954
2016-11-17 00:39:07 +00:00
Jerry Zhang
fb4a03c8f8 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6
am: 5cbd151d40

Change-Id: Ie2920ff5a89c5eee28a31803f9775920289e41c4
2016-11-17 00:24:41 +00:00
Jerry Zhang
5cbd151d40 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 935372bfd6

Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
2016-11-17 00:12:50 +00:00
Jerry Zhang
b37d826204 Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.
2016-11-16 23:59:33 +00:00
Hidenari Koshimae
2b08faf2cc Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa am: 9997fcc72c
am: 9f0cc266ce

Change-Id: I75127bfd0fc4ce9256c775eaeb46582afd637e8d
2016-11-16 08:26:00 +00:00
Hidenari Koshimae
9f0cc266ce Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa
am: 9997fcc72c

Change-Id: Ie09949fbc23ad87e159e063a59983a1a6bff98f8
2016-11-16 08:18:30 +00:00
Hidenari Koshimae
9997fcc72c Merge "CountDownTimer: not skip onTick()"
am: 224d9e48fa

Change-Id: I7ade5d057e73f53867747c00fcfc5882a57a2f4c
2016-11-16 08:10:54 +00:00
Treehugger Robot
224d9e48fa Merge "CountDownTimer: not skip onTick()" 2016-11-16 07:55:27 +00:00
Jerry Zhang
935372bfd6 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit 7a396be6d5)
2016-11-15 15:29:45 -08:00
Hui Shu
1eb8a07e1b Fix WebViewDatabase javadoc.
am: 68d2cc180f

Change-Id: I811966bc364697f5c172cd9b4153d963962d8db2
2016-11-15 20:15:17 +00:00
Selim Gurun
83fbb94e18 Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev 2016-11-15 19:57:42 +00:00
Neil Fuller
9103632f9d Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980
am: ef34053f26

Change-Id: I3724485cc956b2d5a64a6e71f325181d5fdbcccf
2016-11-15 17:04:37 +00:00
Neil Fuller
ef34053f26 Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38
am: 98f03f4980

Change-Id: Ia6592370da446e43896fb56d12f734841e137d49
2016-11-15 16:57:32 +00:00
Neil Fuller
98f03f4980 Merge "Correctly handle when the user has no explicit time_12_24 setting"
am: 8631e19d38

Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
2016-11-15 16:50:29 +00:00
Neil Fuller
8631e19d38 Merge "Correctly handle when the user has no explicit time_12_24 setting" 2016-11-15 16:39:42 +00:00
Neil Fuller
c66ec40d38 Correctly handle when the user has no explicit time_12_24 setting
The code would previously interpret "null" (meaning the user
hasn't touched the setting in the Settings app) as meaning
"use 12 hour format". The actual meaning of "null" is
generally accepted in the platform as
"use the locale default". For example, the Settings app does
this, as does the code in libcore.icu.LocaleData. For
locales where the default is "use 12 hour format" anyway
this wasn't obvious. However, locales like Germany should
default to  24 hour, and then the setting is displayed
incorrectly in the Settings app.

Also, German devices boot for the first time with 12 hour SHORT
and MEDIUM time formats too. After the user had explicitly set
the format the setting would be correct.

There appear to be no tests for this behavior, presumably
because of the difficulty in forcing the setting to "unset"
which would have to have to happen before the app was launched,
and the fact that CTS tests run in the US locale.

Bug: 32868036
Test: Manual testing with a device set to German
Change-Id: Ifd2e8d345f6afee467d7525d6793fc8fda37c900
2016-11-14 16:06:42 +00:00
Jakub Pawlowski
c90cb005fe Merge "Bluetooth: advertising improvements" am: 82c9ba9c55 am: e3b71cd572
am: d81df46e80

Change-Id: I7e17eac0305832d69366b565427ec048a7166357
2016-11-12 00:11:19 +00:00
Jakub Pawlowski
d81df46e80 Merge "Bluetooth: advertising improvements" am: 82c9ba9c55
am: e3b71cd572

Change-Id: I54df9c355ac951d40b2d8e865d5f36f8875ce71f
2016-11-11 23:58:44 +00:00
Jakub Pawlowski
e3b71cd572 Merge "Bluetooth: advertising improvements"
am: 82c9ba9c55

Change-Id: I662ba0f326aa204f9f07ce88bc9d48f5b06770cb
2016-11-11 23:48:51 +00:00
Makoto Onuki
7e1b835a4e App Shortcut: Clarify which attributes must be resources am: 104f805337 am: 2a3fe7d979
am: b0fd5ba122

Change-Id: I4780d09f8b692dbe76f1726a436f9693281fd488
2016-11-11 23:36:04 +00:00
Phil Weaver
115622e9cf Add check for null manger for a11y recents action am: 2585033100
am: 0cd036da23

Change-Id: Ic10e13d83bd6cb2dab3b445e8b5ec41a45e08fa6
2016-11-11 23:29:59 +00:00
Jakub Pawlowski
3d83b0e90b Bluetooth: advertising improvements
This patch removes isPeripheralModeSupported(), hidden public method
which is always returning true. It also modify the BluetoothLeAdvertiser
to be able to use advertising instance with instance id equal 0.

Bug: 30622771
Bug: 24099160
Change-Id: Id31582621dbe56d5c3a8d4ee5cd296af66a5f026
2016-11-11 23:28:32 +00:00
Makoto Onuki
b0fd5ba122 App Shortcut: Clarify which attributes must be resources am: 104f805337
am: 2a3fe7d979

Change-Id: I7858db41a362e3be0a8668f23476b082e8140f43
2016-11-11 23:22:08 +00:00