Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278,113 Commits 3 Branches 0 Tags
c8ff9b50ed8cb5501cbb8009229f696dfe496f84
Commit Graph

68262 Commits

Author SHA1 Message Date
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
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
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
Phil Weaver
0cd036da23 Add check for null manger for a11y recents action 
am: 2585033100

Change-Id: I9b5977ad876048e5c527ff1f8ef6b989283a0e73
 2016-11-11 23:17:41 +00:00
Makoto Onuki
2a3fe7d979 App Shortcut: Clarify which attributes must be resources 
am: 104f805337

Change-Id: I85eb5652c978fe4c41059158cf1d0f180b51fdd7
 2016-11-11 23:14:22 +00:00
Rati Agrawal
87d764f184 Merge "Add check for null manger for a11y recents action" into cw-f-dev 2016-11-11 23:03:35 +00:00
Yigit Boyar
586c7e26f7 List all methods that change data in the docs am: 42c69b9ce4 am: 7e6fdaab69 
am: 93f130e232

Change-Id: Id95fff602b22d376cfd81fbafdc22fac376a644c
 2016-11-11 22:52:01 +00:00
Yigit Boyar
93f130e232 List all methods that change data in the docs am: 42c69b9ce4 
am: 7e6fdaab69

Change-Id: Ife360d719384d958b6022f29f928a5bbae2ed6ef
 2016-11-11 22:39:25 +00:00
Yigit Boyar
7e6fdaab69 List all methods that change data in the docs 
am: 42c69b9ce4

Change-Id: I0808918c44981da63ace801c486d442ff1a99700
 2016-11-11 22:31:15 +00:00
liangweikang
04a9be65c8 Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a3 am: 45562df8bb 
am: b95e567919

Change-Id: I2916de2a4c09849e12bff2dea5a4cd34c080b2f9
 2016-11-11 03:39:39 +00:00
liangweikang
b95e567919 Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a3 
am: 45562df8bb

Change-Id: Ibd3818f9b37ee58c6225a9b6d7cefd486f20bdb9
 2016-11-11 03:32:05 +00:00
liangweikang
45562df8bb Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" 
am: 264d1f12a3

Change-Id: Icfaf039b078d7ce43b23bed09cd0102427c6f047
 2016-11-11 03:25:41 +00:00
Treehugger Robot
264d1f12a3 Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" 2016-11-11 03:16:42 +00:00
Jakub Pawlowski
196fe3597c Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6 
am: f59ad8bd68

Change-Id: I8307894e80bdfc1c260708c7174d294178ffa00b
 2016-11-10 20:24:10 +00:00
Jakub Pawlowski
f59ad8bd68 Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f 
am: c3cfff6ef6

Change-Id: Ia05bccadc06b202cf6ac1039b1e227bd67575bb5
 2016-11-10 20:14:24 +00:00
Jakub Pawlowski
c3cfff6ef6 Merge "BLE OOB Pairing - parse address type (5/5)" 
am: 97d9fe0a2f

Change-Id: I935cc35d9f7f1eea5459f0091ad14dc8b200bc02
 2016-11-10 20:07:39 +00:00
Jakub Pawlowski
f465823f6d BLE OOB Pairing - parse address type (5/5) 
When address type is not parsed, creating bond to devices not using
random address is impossible.

Bug: 32780409
Test: try pairing with nRF52DK using random address
Change-Id: Ie6cc1f8c008d43b2acd021b47f9bbfb1f63472e8
 2016-11-10 19:51:49 +00:00
Selim Cinek
00b6a1dded Fixed a bug with the emergency affordance in multi user 
am: 0294f9e39b

Change-Id: Ib23d37b6ac5cc32aa77aa099c3fa2937ff3570d3
 2016-11-09 23:19:19 +00:00
TreeHugger Robot
6a6bc370e9 Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev 2016-11-09 23:05:43 +00:00
Erik Kline
d8a06fa28a Handle IpReachabilityMonitor errors better. 
am: e452660466

Change-Id: I3bb9ce7caa99e166ddc576399453fcc9e172d6a6
 2016-11-09 02:37:17 +00:00
liangweikang
a9c9bf5106 fixed applyConfigurationToResourcesLocked WeakReference is null 
https://code.google.com/p/android/issues/detail?id=226956

Test: compile anr monkey test

Signed-off-by: liangweikang <liangweikang900911@gmail.com>
 2016-11-09 01:40:33 +00:00
Steven Moreland
97186e09ae Merge "Update for namespaced services in hwservicemanager." am: 605df82c9e am: 3dcee9882d 
am: 1a384933df

Change-Id: I3ab231d9342ec1100866d3da2d752c70793cdcd8
 2016-11-08 21:36:10 +00:00
Steven Moreland
1a384933df Merge "Update for namespaced services in hwservicemanager." am: 605df82c9e 
am: 3dcee9882d

Change-Id: I929f34098061e084f1d9a92070179351c65d5acc
 2016-11-08 21:29:31 +00:00
Steven Moreland
3dcee9882d Merge "Update for namespaced services in hwservicemanager." 
am: 605df82c9e

Change-Id: I38d861ca107665f1f865f19eebd1be368a8c77a4
 2016-11-08 21:20:57 +00:00
Steven Moreland
f3c53496c0 Update for namespaced services in hwservicemanager. 
Test: end to end, hidl_test_java
Bug: 31861268
Change-Id: I3e91cf8a87f9345d4ae0650e521414407c7fc780
 2016-11-08 08:53:16 -08:00
Erik Kline
e452660466 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
 2016-11-08 16:02:24 +09:00
Etan Cohen
2ad6b14d50 Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101 
am: a99a05982e

Change-Id: I8df580e15770c54ab3f0da3e3ff97165939719df
 2016-11-06 03:29:40 +00:00
Etan Cohen
a99a05982e Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 
am: 6571007101

Change-Id: Ief54b313dc5ca5d30645b55ed2ad0333036a1671
 2016-11-06 03:21:37 +00:00
Etan Cohen
6571007101 Merge "[NAN-AWARE] Rename NAN to Aware" 
am: 74b1131cc8

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
 2016-11-06 03:13:31 +00:00
Etan Cohen
0849ded008 [NAN-AWARE] Rename NAN to Aware 
~Rename only (and any reformatting needed to pass lint) - no
functional changes!

Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.

(cherry-pick of commit a61b9fb569)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
 2016-11-05 09:41:38 -07:00
Phil Weaver
2585033100 Add check for null manger for a11y recents action 
Bug: 31986988

Test: Ran A11y cts
Change-Id: Ia6a1e1b921d8b0008edbcf1f1a8d1d3d0eb969c6
(cherry picked from commit 3cdd6c7654)
 2016-11-04 21:12:25 +00:00
Selim Cinek
0294f9e39b Fixed a bug with the emergency affordance in multi user 
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.

Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes: 32424103
Test: manual: switch to secondary user and launch emergency affordance
 2016-11-03 14:58:01 -07:00