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

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Hackmann
4a62720f47 Merge changes Iaa153fca,I619e2d8a 
am: 59acc059a6

Change-Id: Ic657c33aa5fd728d0e5a8fc3c6c23c0fff420844
 2016-09-21 21:15:30 +00:00
Greg Hackmann
dd4f59a76f AlarmManagerService: explain some timerfd_create() failures 
am: a0126e0857

Change-Id: I7c9e394d2edcca81e757e351f9de25447b33c2f4
 2016-09-21 21:15:13 +00:00
Greg Hackmann
ccafcac745 AlarmManagerService: remove legacy /dev/alarm support 
am: d7151c06f1

Change-Id: Ibefee7970e426f69e62b9f31fb7a38d24ad63c2a
 2016-09-21 21:13:56 +00:00
Ajay Panicker
447ac4b31d Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev 2016-09-21 21:08:10 +00:00
Ajay Panicker
f78ff48d0d Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev 2016-09-21 21:08:07 +00:00
Ajay Panicker
c119a677c4 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev 2016-09-21 21:08:04 +00:00
Josh Horwich
999fe148e4 Docs: Fix missing space 
A space got lost when this document got edited recently, this
simply puts it back.

Bug: None
Test: None
Change-Id: I87ee55322d90f6113c3611050d5f5ce1a43bdccb
 2016-09-21 14:04:43 -07:00
Stuart Scott
434c8db80f Continue if package is not in system 
bug:29546655
Change-Id: Ieb17534d60db4643180b915f9b10b0c79a2224e2
 2016-09-21 14:04:22 -07:00
Greg Hackmann
59acc059a6 Merge changes Iaa153fca,I619e2d8a 
* changes:
  AlarmManagerService: explain some timerfd_create() failures
  AlarmManagerService: remove legacy /dev/alarm support
 2016-09-21 21:04:09 +00:00
Andre Eisenbach
031facb524 Merge "List btopp.intent.action.ACCEPT broadcast as protected" am: e2d9cc4bc9 am: c1777a853c 
am: 7b9a3d7134

Change-Id: Id5f74592e87454f6bc5cf4aacb7e99383e38196c
 2016-09-21 21:02:34 +00:00
Andre Eisenbach
7b9a3d7134 Merge "List btopp.intent.action.ACCEPT broadcast as protected" am: e2d9cc4bc9 
am: c1777a853c

Change-Id: I4b953e164c4d77342d63e4a59502e4997a5a04c9
 2016-09-21 20:57:33 +00:00
Andre Eisenbach
c1777a853c Merge "List btopp.intent.action.ACCEPT broadcast as protected" 
am: e2d9cc4bc9

Change-Id: I7e83f318b9a8ab0520d4df66d9faa96e768df612
 2016-09-21 20:51:07 +00:00
Chris Tate
a03b5be55c Merge "Fix WallpaperManager APIs" am: 73e89cd290 am: 6e1400f43f 
am: 2cc80a362a

Change-Id: I57bc74595d92a6c1bfe0d2c9cc75e442723c4f4c
 2016-09-21 20:47:24 +00:00
Etan Cohen
b68ed2876c [NAN] Method renames based on API council feedback 
- Fix tenses throughout
- connect -> attach
- disconnect/terminate -> destroy
- IsUsable -> IsAvailable

Note: pure rename operation - no functional changes

(cherry-pick of commit 34a0342ab5)

Bug: 31470256
Test: unit tests + integration (sl4a) test
Change-Id: I0f275c590c63109b7196622cfc5001082e3eb5a2
 2016-09-21 13:46:21 -07:00
Chris Tate
2cc80a362a Merge "Fix WallpaperManager APIs" am: 73e89cd290 
am: 6e1400f43f

Change-Id: I1b220d887daefe160472fb41959a03eb20e1b98e
 2016-09-21 20:39:56 +00:00
Andre Eisenbach
e2d9cc4bc9 Merge "List btopp.intent.action.ACCEPT broadcast as protected" 2016-09-21 20:38:32 +00:00
Etan Cohen
307572149f Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am: 84b3d2040a am: 337baf9d42 
am: ebe497e40b

Change-Id: I336641dfcfba46ad80936acbc73db869e0a0922a
 2016-09-21 20:35:02 +00:00
Chris Tate
6e1400f43f Merge "Fix WallpaperManager APIs" 
am: 73e89cd290

Change-Id: I6dd139e8ccb71e6c64141733f9de031b20694179
 2016-09-21 20:34:49 +00:00
Etan Cohen
ebe497e40b Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am: 84b3d2040a 
am: 337baf9d42

Change-Id: I9163d5c6f37ba32ad3ee076b345b89d44d96275f
 2016-09-21 20:27:06 +00:00
Chris Tate
73e89cd290 Merge "Fix WallpaperManager APIs" 2016-09-21 20:26:01 +00:00
Etan Cohen
337baf9d42 Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." 
am: 84b3d2040a

Change-Id: I3c20098f26db9e30c18407d01b21ffe729318cce
 2016-09-21 20:21:25 +00:00
Etan Cohen
84b3d2040a Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." 2016-09-21 20:14:13 +00:00
Tyler Gunn
32f0ce9b19 Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev am: 103922f8c6 
am: 7cf3d36095

Change-Id: Ie1723fe35a6b005e962929661236ccdfa3845cc9
 2016-09-21 20:12:51 +00:00
Tyler Gunn
78e81ce277 Fix potential NPE in RemoteConnection. am: 9c2c583ad7 
am: 16a2464291

Change-Id: I09c0719a180c58eb690f2eebffb65aa79d0e9f87
 2016-09-21 20:11:29 +00:00
Tyler Gunn
7cf3d36095 Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev 
am: 103922f8c6

Change-Id: Ib67ba89902ebcdb8c8f0a9202e937a2e8ace4aa2
 2016-09-21 20:03:24 +00:00
Tyler Gunn
16a2464291 Fix potential NPE in RemoteConnection. 
am: 9c2c583ad7

Change-Id: I12d99b4c374da49c051285db3c5b1a4652db6241
 2016-09-21 20:03:22 +00:00
Tyler Gunn
103922f8c6 Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev 2016-09-21 19:56:49 +00:00
Amith Yamasani
43caafa2b6 Don't inform usage stats of interaction for a toast 
If the process is forced to the foreground due to a toast,
don't inform usage stats of an interaction. Otherwise app standby
will be defeated easily.

Bug: 31544592
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdle_toast
Change-Id: I100d839ef8cf361704fd5db4b26dcc878672a235
 2016-09-21 18:53:50 +00:00
Andre Eisenbach
d202664314 Merge "Protect REFRESH_BATCHED_SCAN broadcast" am: 6eb62f8ee3 am: 9271f57c34 
am: 4ceb8fe4b1

Change-Id: I787be32af00a25c5a22e4e8fa6f7f57d34f48da1
 2016-09-21 18:00:57 +00:00
Andre Eisenbach
4ceb8fe4b1 Merge "Protect REFRESH_BATCHED_SCAN broadcast" am: 6eb62f8ee3 
am: 9271f57c34

Change-Id: I3c66beb4f502d967992b2b2070fcb1068744edc5
 2016-09-21 17:55:24 +00:00
Etan Cohen
bd4bf35d22 [NAN] Refactor WifiNanManager to create separate sessions per connect. 
Separate session enables separate namespace for functions which depend
on a connection to exist.

(cherry-pick of commit a2eb21d123)

Bug: 31470256
Test: unit tests, integration (sl4a) tests.
Change-Id: I8be0bc609e55319446cef149ba49cd6f7a5f446a
 2016-09-21 10:54:42 -07:00
Jack He
c82a4f4192 List btopp.intent.action.ACCEPT broadcast as protected 
Bug: 31604112
Test: manual
Change-Id: Ic5ee837bb895fc5b39b6d1abdd91d8f1d33f62ae
 2016-09-21 10:51:47 -07:00
Andre Eisenbach
9271f57c34 Merge "Protect REFRESH_BATCHED_SCAN broadcast" 
am: 6eb62f8ee3

Change-Id: I013391d9b75b6a968f5c7c449ce7cac0501448f4
 2016-09-21 17:49:45 +00:00
Andre Eisenbach
6eb62f8ee3 Merge "Protect REFRESH_BATCHED_SCAN broadcast" 2016-09-21 17:38:48 +00:00
Ajay Panicker
707b68c426 Protect REFRESH_BATCHED_SCAN broadcast 
Bug: 29754520
Test: cherry-pick from internal tree
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
(cherry picked from commit 58dd0cd65e)
 2016-09-21 17:38:08 +00:00
Neil Fuller
025813ad65 Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d am: 3fa8bc066b 
am: 8ed37211bd

Change-Id: I4771be30b206c9f36e5127608c0f27d5bfb6b0ae
 2016-09-21 16:46:25 +00:00
Fan Zhang
57b79a27f7 Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1 am: 9c4561370d am: 9096780031 
am: 1c49ec372b

Change-Id: I38d7255f965de9a10726aaa04078a5ae4b061421
 2016-09-21 16:36:25 +00:00
Fan Zhang
89b07471e3 Fix NPE for WifiConfiguration in AccessPoint. am: 51365c3b4c am: 05df69d52a am: 20370bb9b1 
am: 32edfcd626

Change-Id: I06a590cb7bfef1e39a48d2f9e2e2d4f2b6643920
 2016-09-21 16:35:29 +00:00
Neil Fuller
8ed37211bd Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d 
am: 3fa8bc066b

Change-Id: I4931c55a7390f2d186821f1f734af1f42a0a9798
 2016-09-21 16:28:46 +00:00
Fan Zhang
1c49ec372b Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1 am: 9c4561370d 
am: 9096780031

Change-Id: Iddb1191aa59d0466754de8d6f12f9b31e7138985
 2016-09-21 16:27:53 +00:00
Fan Zhang
32edfcd626 Fix NPE for WifiConfiguration in AccessPoint. am: 51365c3b4c am: 05df69d52a 
am: 20370bb9b1

Change-Id: I179d99b1025f41387f561745991683ad99034630
 2016-09-21 16:26:53 +00:00
Neil Fuller
3fa8bc066b Merge "Track API changes associated with AbstractMethod refactoring" 
am: 117ef7eb9d

Change-Id: Icceb5e5aa4ba12ac837b838e07d338a805f37614
 2016-09-21 16:18:36 +00:00
Fan Zhang
ccaa2fb862 Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1 
am: a2d2f7339b

Change-Id: I537519602248894ccb0b99dee4ec31c5a8ebfd8e
 2016-09-21 16:05:43 +00:00
Fan Zhang
9096780031 Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1 
am: 9c4561370d

Change-Id: I77194b8ef5f71f36020cf02c010d47dd07c12a93
 2016-09-21 16:05:28 +00:00
Neil Fuller
117ef7eb9d Merge "Track API changes associated with AbstractMethod refactoring" 2016-09-21 16:01:56 +00:00
Fan Zhang
23f10408d3 Fix NPE for WifiConfiguration in AccessPoint. am: 51365c3b4c 
am: 3005c2f52a

Change-Id: Ie1b12189ac52ddc9358b08d39d354818e5f75c61
 2016-09-21 15:57:19 +00:00
Fan Zhang
20370bb9b1 Fix NPE for WifiConfiguration in AccessPoint. am: 51365c3b4c 
am: 05df69d52a

Change-Id: I963115016cae383f47e4dfbb262200b945fd3b0d
 2016-09-21 15:57:12 +00:00
Fan Zhang
a2d2f7339b Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev 
am: 32bd448cc1

Change-Id: I36857b40705fa91f80bfdff1843a9db7bcb382b1
 2016-09-21 15:38:27 +00:00
Fan Zhang
3005c2f52a Fix NPE for WifiConfiguration in AccessPoint. 
am: 51365c3b4c

Change-Id: I2b06936d69ae65910105dce9327df3920ebbcd60
 2016-09-21 15:38:22 +00:00
Fan Zhang
9c4561370d Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev 
am: 32bd448cc1

Change-Id: I11d2bdcbd0635510ae7a53574749404a96162773
 2016-09-21 15:38:12 +00:00