Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,109 Commits 3 Branches 0 Tags
12488ed15f5301e9208085f2a38b01f77b383ee9
Commit Graph

277109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerry Zhang
12488ed15f Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204 
am: 1faf15d422

Change-Id: I00ab9ec389091e0616aa313825a8d3f0d7963eff
 2016-11-17 00:36:52 +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
5d77efb3d9 Clean up persistent usb state on boot. am: dfacad026d 
am: b15490ac4d

Change-Id: I2fd38cd6b27685206f6aa5f11daecbc7654749d1
 2016-11-17 00:23:47 +00:00
Jerry Zhang
1faf15d422 Merge changes from topic 'usb_bugfixes-mirror-aosp-master' 
am: b37d826204

Change-Id: Id5e28b59858b16c1cfde16104feb54f2a101e366
 2016-11-17 00:22:59 +00:00
Jerry Zhang
dbcbadbb99 Fixed handling of usb state during adb changes. am: 0269ebe0fe 
am: 4389cb6c9a

Change-Id: Ie93d9df3fad63ba937b3069695744d5cadd2796c
 2016-11-17 00:22:53 +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
b15490ac4d Clean up persistent usb state on boot. 
am: dfacad026d

Change-Id: I762306bc76e304c6491c8af18e82bf2e0c4b433e
 2016-11-17 00:11:15 +00:00
Jerry Zhang
4389cb6c9a Fixed handling of usb state during adb changes. 
am: 0269ebe0fe

Change-Id: I2fc3674c4d5cc63febe2ebf47576f3cf1bcd1da2
 2016-11-17 00:10:25 +00:00
Ningyuan Wang
7cad272109 Merge "Add security capabilities enums to ScanResult" am: a3c0324824 
am: 6e67bb87cf

Change-Id: I02934a0a018bf759559d710f2edff1abe49df2cd
 2016-11-17 00:01:23 +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
Ningyuan Wang
6e67bb87cf Merge "Add security capabilities enums to ScanResult" 
am: a3c0324824

Change-Id: Iad2aba87155d52343b372b2d7af3e037842c1ca4
 2016-11-16 23:54:24 +00:00
Treehugger Robot
a3c0324824 Merge "Add security capabilities enums to ScanResult" 2016-11-16 23:42:25 +00:00
Yifan Hong
afe46992b8 Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d 
am: 2f7a3f9595

Change-Id: Id85f0bb5b53ca3a693ab1bf137627159b6d382d5
 2016-11-16 19:16:45 +00:00
Ningyuan Wang
d150b2b001 Add security capabilities enums to ScanResult 
This adds enums of security parameters, including
protocol, key management, and cipher suites.

Bug: 32512793
Test: compile

Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
 2016-11-16 11:13:42 -08:00
Yifan Hong
2f7a3f9595 Merge "Fix include after spliting HidlSupport.h" 
am: efd7b9f57d

Change-Id: I6b0b3482feb169ae89ffa6e20561ad64b42d12d1
 2016-11-16 19:10:20 +00:00
Yifan Hong
efd7b9f57d Merge "Fix include after spliting HidlSupport.h" 2016-11-16 19:01:00 +00:00
Andreas Gampe
6a454c86db Merge "Preload2: Fix dependencies" am: 3b379ee94e 
am: 74b4e070be

Change-Id: I6bbc33352648a352ed8be54bb3cb2eb9e065f074
 2016-11-16 18:32:56 +00:00
Andreas Gampe
74b4e070be Merge "Preload2: Fix dependencies" 
am: 3b379ee94e

Change-Id: If3ecad631e5f7deb9b2f348a26d9b41f8a00b4f5
 2016-11-16 18:25:37 +00:00
Treehugger Robot
3b379ee94e Merge "Preload2: Fix dependencies" 2016-11-16 18:15:06 +00:00
Martijn Coenen
6e2c276c78 Merge "Fix deprecated range_x calls." am: 87cafe8f33 
am: d03b17c29a

Change-Id: I70280eb85b9430c23f6b2681375cbcfa9da2dd38
 2016-11-16 10:07:54 +00:00
Martijn Coenen
d03b17c29a Merge "Fix deprecated range_x calls." 
am: 87cafe8f33

Change-Id: Idfbc4e3475cea7e56b3ac72afd61e1e981ef4e5d
 2016-11-16 10:00:23 +00:00
Martijn Coenen
87cafe8f33 Merge "Fix deprecated range_x calls." 2016-11-16 09:48:31 +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
longhai
5c152a3d7f Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 
am: 2be54fde72

Change-Id: I14e1d5aa6bda143e2a87bba1ea65b8384c44e3a1
 2016-11-16 03:11:09 +00:00
longhai
2be54fde72 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 
am: 1813ae0159

Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e
 2016-11-16 03:04:38 +00:00
Treehugger Robot
1813ae0159 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 2016-11-16 02:54:26 +00:00
Peter Qiu
2e73b06f63 Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf 
am: afb8f37711

Change-Id: I413a4e86233f103767c24b636212faf3fba3dcf9
 2016-11-16 00:18:36 +00:00
Peter Qiu
134706940b wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 
am: 1b39c61ce7

Change-Id: Ia81a0d8b77a6031670b89f97d21fc29be9631fb3
 2016-11-16 00:16:30 +00:00
Peter Qiu
31b8e658d3 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 
am: a9a9a9bb8d

Change-Id: I5be1220539e5a22e4f0d4e3d52ac85c608ccb950
 2016-11-16 00:14:46 +00:00
Peter Qiu
afb8f37711 Merge changes from topic 'HS2 API Cleanup' 
am: 41fd0f1faf

Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382
 2016-11-16 00:04:44 +00:00
Yifan Hong
ddf31f604e Fix include after spliting HidlSupport.h 
Test: mma

Bug: 32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4
 2016-11-15 16:02:40 -08:00
Peter Qiu
1b39c61ce7 wifi: remove unused hidden Hotspot 2.0 Release 1 API 
am: 1c3054ea87

Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19
 2016-11-16 00:00:06 +00:00
Peter Qiu
a9a9a9bb8d wifi: remove hidden unused Hotspot 2.0 Release 2 APIs 
am: a38558b539

Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787
 2016-11-15 23:59:20 +00:00
Treehugger Robot
41fd0f1faf Merge changes from topic 'HS2 API Cleanup' 
* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
 2016-11-15 23:50:18 +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
Jerry Zhang
dfacad026d Clean up persistent usb state on boot. 
b/31814300 was fixed, but mtp can still stick around in the
persistent config even after flashing. This block of code
will only run once, but will ensure that mtp is not in
the config after the update.

Bug: 31814300
Test: Manual
Change-Id: Icf02be38c9e1f769412ac963ed6afc14e6092bfb
(cherry-picked from commit a45dac0e83)
 2016-11-15 15:29:36 -08:00
Jerry Zhang
0269ebe0fe Fixed handling of usb state during adb changes. 
When changing state to adb from mtp (charging), we want to disable
the old mtp function. Similarly when change to away from adb to
charging, enable the mtp function.

Also the mtp function should never be persisted.

Bug: 31818377
Bug: 31814300
Test: Manually verify that the correct usb configuration is displayed.
Test: Manually verify that logcat is not kicked during boot.
Change-Id: Idcb7f53be39ea38712d5de45b323d8daeb552129
(cherry-picked from commit 58018d01a3)
 2016-11-15 15:29:22 -08: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
Martijn Coenen
90213f341d Fix deprecated range_x calls. 
Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb
 2016-11-15 09:07:12 +01:00
Peter Qiu
0a5b88e286 Merge "osu: remove calls to deprecated APIs" am: e9514808d7 
am: 30874ed6ed

Change-Id: I43093bf243cb249ad892bdf94ea9781ca734e239
 2016-11-15 04:23:21 +00:00
Peter Qiu
30874ed6ed Merge "osu: remove calls to deprecated APIs" 
am: e9514808d7

Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75
 2016-11-15 04:15:59 +00:00
Treehugger Robot
e9514808d7 Merge "osu: remove calls to deprecated APIs" 2016-11-15 03:59:57 +00:00
Svetoslav Ganov
05149e69cb Merge "Add WiFi toggle prompts - framework" into stage-aosp-master 
am: 9f078049cf

Change-Id: I28501fc58e597c1f5e9d4da6bfaa3a015cad1260
 2016-11-15 03:28:20 +00:00
Svetoslav Ganov
23328d9714 Add WiFi toggle prompts - framework 
am: 6c3032f16b

Change-Id: Ie89a9b91b8b1cd7158a743d8b5870d8f9d6f8adc
 2016-11-15 03:27:22 +00:00
TreeHugger Robot
9f078049cf Merge "Add WiFi toggle prompts - framework" into stage-aosp-master 2016-11-15 03:18:26 +00:00
Yifan Hong
41579ea4d4 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am: 8cc1343724 
am: 2187dc5ca1

Change-Id: If0919864026c78fed76df1554235c2acca9f2750
 2016-11-15 03:12:43 +00:00