drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
316,005 Commits 1 Branch 0 Tags
Commit Graph

316005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryce Lee
5aa7e073bc Merge "Remove window container from empty task when destroying." into oc-dev am: 61bce9ab13 
am: a27128b8c7

Change-Id: Iadbae988357788bb50bbaebd7e4a580aaefb4308
 2017-04-14 16:06:48 +00:00
Adam Lesinski
c96e4b0f76 Merge "BatteryStats: Remove reading of cpu power" into oc-dev am: af85d84050 
am: 51d94c82af

Change-Id: I0bef2f7074a06f8336d727dd89c685c76262eca5
 2017-04-14 16:04:32 +00:00
Jim Van Verth
99effcccbc Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev am: 1be9766a68 
am: c7fd8db8a6

Change-Id: If7f3bfc01496a9fe9b198dc63bd7c064943c9008
 2017-04-14 16:03:13 +00:00
Dianne Hackborn
cc04f02b44 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am: 29c70437b3 
am: 76c71a01e2

Change-Id: Ieafe036ee6c2662d5897a8052facd3cd0d9fbed7
 2017-04-14 16:01:58 +00:00
Jason Monk
108b8ec82a Merge "Fix leak in nav bar" into oc-dev am: 0b67d53ba9 
am: cea904333e

Change-Id: I51b2753f46f5b18e791af39020aab2c8547981df
 2017-04-14 16:01:02 +00:00
Shuo Qian
2480cc7e09 Merge "ECBM SystemProperty cleanup" into oc-dev am: efb8882b47 
am: 21d8d8095e

Change-Id: I2e92b292366138f1e9b0d559ffec407b702d81ba
 2017-04-14 15:59:28 +00:00
Geoffrey Pitsch
e1a00e34db Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev am: c4ca1b5677 
am: aa8dcf3751

Change-Id: Ic9780a11f1c3d3bbcbd8c5be350176507c62c685
 2017-04-14 15:58:22 +00:00
Jack He
79418b63e3 Merge "Add developer setting and system API for inband ringing support" into oc-dev am: aadf525e1a 
am: 97164fe986

Change-Id: Iddc91ebca96bcb8e660c1b7117ab3fa57be7d4ee
 2017-04-14 15:56:10 +00:00
Todd Kennedy
5fb012e45d Merge "Filter instant app content providers" into oc-dev am: 3891674204 
am: 0bb486bcb4

Change-Id: If96297cade9909d744eb57669aecd96841a27a31
 2017-04-14 15:42:02 +00:00
Hugo Benichi
9b7453f3c6 Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 am: 4d80366762 
am: e505b37ec5

Change-Id: I99267e14ab04ce62c5c2385f24f5865e791a24a0
 2017-04-14 15:36:10 +00:00
Jason Monk
ecb4a9b390 Merge "Update mobile data icon" into oc-dev am: 99856429db 
am: 4520cb7ad9

Change-Id: I5fc19134a1ec0da5d4ede330a0d430ed428a53fa
 2017-04-14 15:35:20 +00:00
Chris Tate
d593e402c2 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev am: 117ac766a9 
am: 636915a2ed

Change-Id: I28d8d31b30c9b500be1796566bb9885741b9aedc
 2017-04-14 15:34:16 +00:00
Seigo Nonaka
659c9cfac3 Merge "Introduce setFallbackTypeface" into oc-dev am: 729a515e5e 
am: 17452ee553

Change-Id: I66fe816727aae3fdf617c41796b25478090704fe
 2017-04-14 15:31:25 +00:00
Yu Liu
c831fe6183 Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev am: e425b366ba 
am: 5303f33bdc

Change-Id: I138cf20ba4b804fb3627458acf6796203c37be39
 2017-04-14 15:30:05 +00:00
Hugo Benichi
e505b37ec5 Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 
am: 4d80366762

Change-Id: I8c5d3fba8aaa19e8ffd1146ddb68c4279140f921
 2017-04-14 15:29:09 +00:00
Daniel Sandler
7775be8a74 Merge "Quick fix to lockscreen text color." into oc-dev am: f06c2a01a5 
am: dc4fd3c847

Change-Id: Ieb6074d94b85a04ac7c87b5295b52817b2671c8e
 2017-04-14 15:28:56 +00:00
Seigo Nonaka
83c52e0a40 Merge "Use provided style for fallback font selection" into oc-dev 
am: 43112fd26e

Change-Id: I15c19e1f5ff7919895af967f3ebf2d9564e0ce89
 2017-04-14 15:24:10 +00:00
Hugo Benichi
4d80366762 Merge "ConnectivityManager: release all requests mapping to a callback." 
am: 1a8f04b1b2

Change-Id: I30d3790822430d250d6005cc165e7fa10f56649e
 2017-04-14 15:22:39 +00:00
Seigo Nonaka
43112fd26e Merge "Use provided style for fallback font selection" into oc-dev 2017-04-14 15:13:15 +00:00
Treehugger Robot
1a8f04b1b2 Merge "ConnectivityManager: release all requests mapping to a callback." 2017-04-14 15:10:10 +00:00
Benoit Lamarche
309335e727 resolve merge conflicts of 57fb5872d19c to master 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8
 2017-04-14 15:59:04 +02:00
Hugo Benichi
dafed3d008 ConnectivityManager: release all requests mapping to a callback. 
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
  - callback recycling: releasing then reregistering a callback again.
  - multiple request registrations with the same callback.

The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.

In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
  - request to callback unmapping is done synchronously at callback
    release time.
  - all requests associated to a callback are unmapped at callback
    release time.

This fixes the following issues:
  - a callback stops being triggered as soon as it is released.
    Otherwise when recycling the callback immediately, it is possible
    the previous request associated with it triggers it, confusing the
    app.
  - when a callback is registered multiple times, the requests are not
    leaked.
  - when a callback is registered multiple times and then released, the
    N-1 first registrations do not trigger the callback anymore.

In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.

Bug: 35921499, 35955593, 20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
      recycling, and a disabled test for no multiple regristration.
      - new tests catch regression causing b/35921499, b/35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
 2017-04-14 22:17:21 +09:00
Roozbeh Pournader
20041c2d00 Merge "Switch i18n listeners to use IME hint locales" into oc-dev am: da97b66f41 
am: 18fcf3f0d7

Change-Id: I43faa4ab695c52adf3c6d6f6170ffa5b6bc631f2
 2017-04-14 13:15:32 +00:00
Chris Wren
12ac68a26f Merge "don't interpret milliseconds as nanoseconds" into oc-dev am: de12503268 
am: a881fc2e2c

Change-Id: I6c803ec08b218203f3880cf0b2b269b3a6cb0692
 2017-04-14 13:14:37 +00:00
Steve McKay
64b0757448 Merge "Remove support for auto-paging of cursors." into oc-dev am: 7f0d8c8076 
am: 0b28e794de

Change-Id: I96a8d2c4a0a90fdf70d4eced90306fe9ac75175c
 2017-04-14 13:12:16 +00:00
Daichi Hirono
57f94d02ba Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev am: 73b54bfd6d 
am: 8bf30a7826

Change-Id: I48091d9868233f0ef329d0c2db4ffac5bba04eac
 2017-04-14 13:11:01 +00:00
Andrew Solovay
47cdd3d8e9 Merge "doc: Add note to Context.bindService()" into oc-dev am: 2c63aa3be7 
am: 7cfe7cf19b

Change-Id: I6cd7cf2e25c0038afcf96a26ea2b8635a8ca7d95
 2017-04-14 13:09:59 +00:00
Dave Friedman
ecfa46be1b Merge "Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d am: f125662db1" into oc-dev am: 46802905f5 
am: 0e6b584116

Change-Id: Iedd3941d4bf4fcabd6ed24d510f54f4c5b71d903
 2017-04-14 13:08:57 +00:00
Matt Sarett
c5b30dda38 Merge "Add SkiaCanvas::captureCanvasState()" into oc-dev am: 59fa17a9d4 
am: d6b4c56a91  -s ours

Change-Id: Icabef048a4bba724ee674bdf80685397755c0d0b
 2017-04-14 13:07:31 +00:00
Hugo Benichi
af18992066 Merge "Captive portal: rotate fallback urls" into oc-dev 
am: a622b24d3a  -s ours

Change-Id: I60f1cca6bb834f8f82dd0627c0943f5785a79122
 2017-04-14 12:34:33 +00:00
Hugo Benichi
a622b24d3a Merge "Captive portal: rotate fallback urls" into oc-dev 2017-04-14 12:28:42 +00:00
Jorim Jaggi
27af670d9a Merge "Implement new splash screen API" into oc-dev 
am: 46ae660bf2

Change-Id: I2f12289fcf82754a46365d0342997ae7bf59a2f8
 2017-04-14 12:02:08 +00:00
TreeHugger Robot
46ae660bf2 Merge "Implement new splash screen API" into oc-dev 2017-04-14 11:54:47 +00:00
Andrew Scull
d4be031c76 Merge "Service for OEM lock management." into oc-dev 
am: e52a1bfede

Change-Id: I074e29147417d6a358fd97e7e60cd4cfbed5c4df
 2017-04-14 11:43:03 +00:00
Andrew Scull
e52a1bfede Merge "Service for OEM lock management." into oc-dev 2017-04-14 11:31:06 +00:00
Svet Ganov
1ded7a1ab1 Add back an id used by CTS 
am: 3de36a3cc1

Change-Id: I4c7ad8ad12f555cf6244092498da471043dbdb9f
 2017-04-14 10:01:13 +00:00
Hugo Benichi
35025da669 Captive portal: rotate fallback urls 
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Merged-In: I3c010bfee5b99db03a500776fbf47959a29d0578

(cherry picked from commit eef918a66c984ac7bb1f541665f4dc9bb88ea7ac)

Change-Id: If4d9a091c3a04a33895032d9b0d05c1dc66968e7
 2017-04-14 08:16:37 +00:00
Svet Ganov
3de36a3cc1 Add back an id used by CTS 
Test: tests can find the autofill dropdown

Change-Id: I4361960b4a12e02b06cca1e3112e4679cd6e484d
 2017-04-14 08:02:33 +00:00
Casey Burkhardt
549a439b53 Merge "Icon assets for magnification" into oc-dev 
am: 4d386d5ce7

Change-Id: I2d75a1bdbaff4ec53b7c7a903374932e092de2cf
 2017-04-14 07:48:19 +00:00
Jakub Pawlowski
ed6ce8637b Bluetooth 5 PHY simplification 
am: a51513747a

Change-Id: I01dc8b494069bb8a1c19ac6ba8aefb5029b991b3
 2017-04-14 07:47:10 +00:00
TreeHugger Robot
4d386d5ce7 Merge "Icon assets for magnification" into oc-dev 2017-04-14 07:41:40 +00:00
Jakub Pawlowski
a51513747a Bluetooth 5 PHY simplification 
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.

This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.

Bug: 30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
(cherry picked from commit 9e377194e35c0fb9ac5771f5658c095ed97e0838)
 2017-04-14 07:33:55 +00:00
Hugo Benichi
43cdbc943d Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5 
am: 4479901ff3

Change-Id: I7d20b9f247a30920df1938b680e63bc1739e1fa9
 2017-04-14 07:07:46 +00:00
Hugo Benichi
4479901ff3 Merge "Captive portal: rotate fallback urls" am: 76b3537dfd 
am: 605eafe0a5

Change-Id: I456d8a2af20dc2fa1553e0e27ec0280380ae6f38
 2017-04-14 07:00:41 +00:00
Hugo Benichi
605eafe0a5 Merge "Captive portal: rotate fallback urls" 
am: 76b3537dfd

Change-Id: I5583659f2f79cf5d42e7825dfbda875ce359ddb0
 2017-04-14 06:54:10 +00:00
Treehugger Robot
76b3537dfd Merge "Captive portal: rotate fallback urls" 2017-04-14 06:41:08 +00:00
Jorim Jaggi
5cf511907d Merge "Make sure theme attributes don't get lost" into oc-dev 
am: 9d2f03ec5d

Change-Id: I4a2d163e18ce899eb97bfcff7c92de3a7ffb186c
 2017-04-14 05:34:38 +00:00
TreeHugger Robot
9d2f03ec5d Merge "Make sure theme attributes don't get lost" into oc-dev 2017-04-14 05:24:45 +00:00
Winson Chung
3a32d35723 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev 
am: 2e86be7653

Change-Id: Idec10c8c0aadccabcd639b5a02e426dc677b9f14
 2017-04-14 05:22:04 +00:00
Romain Guy
299ae2f422 Merge "Fix javadoc typos" into oc-dev 
am: 4b6e82d237

Change-Id: I03e9608a10deb04d3821bf411c033300bb6272ee
 2017-04-14 05:20:55 +00:00