Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
283,389 Commits 3 Branches 0 Tags
2f2b5aca204281179e164396fa63f6e67c2dd599
Commit Graph

63505 Commits

Author SHA1 Message Date
Jakub Pawlowski
2dd2fead45 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242 am: 9f341e4e49 
am: 8348bd2317

Change-Id: I15b6c8ab87822e5f33bdfabcb8e09e8ce9501cd7
 2016-09-01 01:27:03 +00:00
Neil Fuller
4e4f9a24e0 Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1 am: ef1fb4889a 
am: 0aa7d4bb3f

Change-Id: I35b4ff81c9263a3a2d3052602fe43bc37377c733
 2016-09-01 01:18:32 +00:00
Svetoslav Ganov
388d08b6e3 resolve merge conflicts of a2c1196 to master 
Change-Id: I221f03e2cda9e677199698d492d16788c25c9e96
 2016-08-31 18:02:57 -07:00
sergeyv
22ddb31dce TextureView: clean up displaylists am: 17dd01b693 am: ac2ca87e92 
am: bb37b7b613

Change-Id: I12252ddc60ad7f52fe1604ac84042a759b8373c4
 2016-08-31 23:47:32 +00:00
Makoto Onuki
034de15cb6 Update CP2 javadoc am: 93d94ebac2 am: e3972019dc 
am: e08b704cb7

Change-Id: Ie9e3aea4157d848044254a779b2d3a3df0f8152d
 2016-08-31 23:32:38 +00:00
Lorenzo Colitti
e22143e855 Network switch notifications: rate & daily limits am: 84e6f1232c am: 858499b2c0 am: 2c535a4f7c 
am: 98ed392cf7

Change-Id: I0c067ec355eb2a50af3c828b1fe3ee8a78e44536
 2016-08-31 23:31:56 +00:00
Eino-Ville Talvala
749967cfa5 android.view.Surface: Add parceling warning am: f005f5ed88 am: 286b1a83e4 
am: b13b6bd20e

Change-Id: I05b118022efb506ba57e93e1f58a077ebb951f55
 2016-08-31 22:53:05 +00:00
Ned Burns
c8a00b2478 Add rotary encoder support to scrolling containers am: 20ad073581 
am: dc47505734

Change-Id: I20d6731276defbc2605ca078011c5c1bc5f18cdc
 2016-08-31 22:28:55 +00:00
Jorim Jaggi
32cbdcc8c0 resolve merge conflicts of c5bafe2 to master 
Change-Id: I19dd5c88c664313c2f8b47d8f8fd556f630c8bf1
 2016-08-31 13:51:50 -07:00
Tor Norbye
366a3f14f5 Merge "Add SYSTEM_HEALTH_SERVICE to the ServiceName typedef" 2016-08-31 19:23:41 +00:00
Jakub Pawlowski
8348bd2317 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242 
am: 9f341e4e49

Change-Id: Ic3461b98449636cfc125890f255b1332d0ef5132
 2016-08-31 18:28:45 +00:00
Jakub Pawlowski
9f341e4e49 Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a 
am: 40a16ea242

Change-Id: I0d08f623e78fdd779b39083d0da3a45aee72ff3c
 2016-08-31 18:21:00 +00:00
Jakub Pawlowski
5f87c4539a Merge "Separate advertiser from GATT client (1/4)" 2016-08-31 18:05:27 +00:00
TreeHugger Robot
1ae9143d7a Merge "Do not leak usb device connection FD" 2016-08-31 18:03:12 +00:00
Neil Fuller
0aa7d4bb3f Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1 
am: ef1fb4889a

Change-Id: Ie4befe516f369d903a61f22aab15e40ac09193a3
 2016-08-31 16:47:33 +00:00
Neil Fuller
ef1fb4889a Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 
am: 680ec020a1

Change-Id: I9b5622a91cf459844ee3513191b45994d51c86a7
 2016-08-31 16:43:22 +00:00
Neil Fuller
7a9c0cd854 Merge "Fix receive timeout on LocalSocket" 2016-08-31 16:28:17 +00:00
Jakub Pawlowski
a480f7fe28 Separate advertiser from GATT client (1/4) 
Bug: 30622771
Change-Id: I08c0498f8a1ea04423d3e864e9a60c7c78f1dbad
 2016-08-31 03:36:53 -07:00
Neil Fuller
a8280a5d34 Fix receive timeout on LocalSocket 
The receive timeout stopped being set incorrect due to commit
c80af6d8. There is an associated CTS regression test in cts/.

Test: Ran CTS test android.net.cts.LocalSocketTest
Bug: 31205169
Change-Id: I99808478946f8eae502c49d2cb83465648b9c904
 2016-08-31 11:32:17 +01:00
Tony Mak
72b817d1e6 Merge "Send ACTION_DEVICE_OWNER_CHANGED broadcast after clearing device owner" 2016-08-31 10:16:59 +00:00
Greg Kaiser
f4d609b9c0 ContextHubService: Hack in Google vendor value am: 5817ce0c13 am: 3d2f2a4305 
am: ee483f7d78

Change-Id: I8ca30026b44d6ccea7cefa4b6671b4f286c352b5
 2016-08-31 03:04:41 +00:00
Pablo Ceballos
1209bc144b Fail createVirtualDisplay with single-buffered Surface am: aff2f94939 am: d387b20dcb 
am: 658f26634f

Change-Id: I499988d911ffd5ccd4b5bc10c75f3e0ed9a897c8
 2016-08-31 02:56:35 +00:00
Svetoslav Ganov
a2c1196dc2 Properly close fd backing a MemoryIntArray am: fe2462f3a6 
am: b7be22cdaf

Change-Id: Ie598d2310fff4d72f618ecfa9e2efae78c595a10
 2016-08-31 01:04:00 +00:00
Svetoslav Ganov
b7be22cdaf Properly close fd backing a MemoryIntArray 
am: fe2462f3a6

Change-Id: Iaf35af209d210ba0aa6239bdeb0c81a079d25543
 2016-08-31 00:56:32 +00:00
Adam Powell
8c52bf51a2 Fixes for ImageView drawable visibility dispatch am: 06f9eb8b62 am: fd86f7fdfd am: ee2f4d890e 
am: 393279da8f

Change-Id: I7e42805b096de31e388cd86ee87b44f312841aed
 2016-08-31 00:54:04 +00:00
sergeyv
bb37b7b613 TextureView: clean up displaylists am: 17dd01b693 
am: ac2ca87e92

Change-Id: I69adecc118bed63acf46f6a1a64c9cc7e376edaa
 2016-08-31 00:37:51 +00:00
Todd Kennedy
8402d225c0 Enable web action apps based on system setting am: efc1c4d501 am: 742f4de6cf 
am: 66db34fbe2

Change-Id: Ic1726786e0baeaf758381f3a9a9324ea39b921be
 2016-08-31 00:37:13 +00:00
sergeyv
ac2ca87e92 TextureView: clean up displaylists 
am: 17dd01b693

Change-Id: Ib32a64f032b9f7230414f038417b2151f1e6e4be
 2016-08-31 00:32:17 +00:00
Tor Norbye
5afebff407 Add SYSTEM_HEALTH_SERVICE to the ServiceName typedef 
Change-Id: I65c78a079152b2c4d82f8228ca14714ffff282c5
 2016-08-30 17:12:53 -07:00
Jason Monk
297d238130 Backup system QS tiles DO NOT MERGE 
am: 37bd2be160

Change-Id: I5d291b5ee504acf40386cbce4edaf5b20a1a3d3d
 2016-08-30 22:50:10 +00:00
Makoto Onuki
e08b704cb7 Update CP2 javadoc am: 93d94ebac2 
am: e3972019dc

Change-Id: Ia988c68813311b042c6ba9fbaa3c486935e5566b
 2016-08-30 22:49:57 +00:00
Makoto Onuki
e3972019dc Update CP2 javadoc 
am: 93d94ebac2

Change-Id: I2b1cddae5407257aaad84f4b9dd492fe69ae5d27
 2016-08-30 22:42:41 +00:00
sergeyv
17dd01b693 TextureView: clean up displaylists 
bug:31066756
Change-Id: Ibc61825ad1ed12479e9de18cc06be7401d3fc93a
 2016-08-30 14:03:32 -07:00
Lorenzo Colitti
98ed392cf7 Network switch notifications: rate & daily limits am: 84e6f1232c am: 858499b2c0 
am: 2c535a4f7c

Change-Id: I166dd693345ed9a63411f5f1ed6bdf33015b1957
 2016-08-30 20:32:52 +00:00
Lorenzo Colitti
2c535a4f7c Network switch notifications: rate & daily limits am: 84e6f1232c 
am: 858499b2c0

Change-Id: I9cf27874626c3034ef4fb4fc23ec75f3e1ac5f3f
 2016-08-30 20:24:14 +00:00
Lorenzo Colitti
858499b2c0 Network switch notifications: rate & daily limits 
am: 84e6f1232c

Change-Id: Ibf6fa695c5f8ef11c99fe075b59a36f52c5c177b
 2016-08-30 20:17:33 +00:00
Jason Monk
37bd2be160 Backup system QS tiles DO NOT MERGE 
Add QS tiles to the backup list.  Non-system tiles will get removed
since they won't be installed when restore happens.

Change-Id: Iccf6e773384c45bd4d1f10c21aa8af356b3920d2
Bug: 28782938
 2016-08-30 15:48:15 -04:00
Abodunrinwa Toki
306bcc3dd4 Merge "EditText: Proper support for "textIsSelectable"." 2016-08-30 19:04:38 +00:00
Eino-Ville Talvala
b13b6bd20e android.view.Surface: Add parceling warning am: f005f5ed88 
am: 286b1a83e4

Change-Id: I799dca3ed9da618ec88b8d554520aba649918d94
 2016-08-30 17:57:12 +00:00
Philip P. Moltmann
674e8c3825 Do not leak usb device connection FD 
The native code uses mNativeContext=0 to indicate that is was already
closed and checks this properly. Hence let's leave the checking in the
native code.

We need to keep a reference in UsbRequest as otherwise the
UsbDeviceConnection might get finalized while a UsbRequest is in
progress. The UsbRequest itself makes sure that it is not garbage
collected while the I/O is in progress.

Also I added CloseGuards to make sure the classes are used properly and
fixed an error string in the native code.

Fixes: 31124312
Bug: 31021315
Change-Id: I96deb73957eba0e14e6b656988a2ae9b409bf55f
 2016-08-30 10:52:39 -07:00
Eino-Ville Talvala
286b1a83e4 android.view.Surface: Add parceling warning 
am: f005f5ed88

Change-Id: Id2c772873fbf98653e751036790484d0fbf7bb16
 2016-08-30 17:50:12 +00:00
Eino-Ville Talvala
0656931d18 Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev 2016-08-30 17:44:11 +00:00
Raph Levien
84c45e7085 Enforce consistent sizes for arrays in SpannableStringInternal 
am: 9cde7244b6

Change-Id: Ie1fa575d83754d39a6bc30ba542411709f7a2c46
 2016-08-30 17:36:33 +00:00
Raph Levien
5d628b1e45 Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev 2016-08-30 17:25:58 +00:00
Greg Kaiser
ed2a5f8592 ContextHubManager: Document InstanceInfo bug am: 3be73d3950 am: 6f155aa4bf 
am: 7fd9e40381

Change-Id: I0f95997e013d5cb8fb23b18ad82763cc091e38f1
 2016-08-30 17:20:09 +00:00
Paul Stewart
c4ec49b7b9 Document correct context for obtaining WifiManager am: 0e164b199e am: b09557b3cf 
am: 163a135246

Change-Id: I943a2d60461633b9432bdf83c3b25086bba22b94
 2016-08-30 17:20:02 +00:00
Tony Mak
1970f97e47 Send ACTION_DEVICE_OWNER_CHANGED broadcast after clearing device owner 
Change-Id: Iaac182c69a30e941da3a017a923247d813881521
Fix: 27261692
 2016-08-30 17:41:48 +01:00
Lorenzo Colitti
84e6f1232c Network switch notifications: rate & daily limits 
This patch adds a daily limit to the maximum number of notifications
shown when switching networks.

It also adds a rate limit to prevent rapid successive notifications in
flapping scenarios.

Bug: 31132499
Change-Id: Iccb6d0899646ea6df3cfad32a421922263e0eb85
 2016-08-31 00:36:11 +09:00
Jason Monk
90a788e29b resolve merge conflicts of d70ed99 to master 
Change-Id: I3a8d3708e050b3fb963dd057c0be9d2d249d037a
 2016-08-30 10:54:03 -04:00
Victor Chang
3f98ea1eee Merge "forceUpdateUserSetupComplete should have no effect in user build" 2016-08-30 12:38:53 +00:00