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

314815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugene Susla
c242b76a4b [DO NOT MERGE] Stop scan on device chooser activity backgrounded 
am: 200c37f413

Change-Id: I29fbe568cccac08e6fa28ec8cf1c027290d35efc
 2017-04-14 23:30:46 +00:00
Eugene Susla
24cf2d9d72 [DO NOT MERGE] Improve the error msg when started not for result 
am: 5423b4e0a8

Change-Id: I44b112065b12b10cfd00498479380a9c5ad57be4
 2017-04-14 23:23:45 +00:00
Svetoslav Ganov
c9741d133d Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev 
am: 728ce60465

Change-Id: Ic89d0c7084e56e24a358191660aeebe917df6b4b
 2017-04-14 23:18:03 +00:00
Eugene Susla
200c37f413 [DO NOT MERGE] Stop scan on device chooser activity backgrounded 
This effectively treats chooser activity pause event as cancel.

Bug: 30932767
Test: Install two toy apps and call associate API from both.
  Ensure foreground app always end up showing fresh data.

Change-Id: I7f5742e9878245550f678efd244bf84c427baef3
 2017-04-14 23:17:04 +00:00
Eugene Susla
5423b4e0a8 [DO NOT MERGE] Improve the error msg when started not for result 
This makes sure that if the association request callback IntentResult
s accidentally started not for result, the resulting exception is
metioning it explicitly.

Test: Ensure the error message when calling the IntentSender not for result
  explicitly mentions the requirement for the activity to be called for result.
Bug: 30932767

Change-Id: I950f262af43c555fb20dd5e49e935e476f24bba8
 2017-04-14 23:15:12 +00:00
Svetoslav Ganov
728ce60465 Merge "[DO NOT MERGE] Fix a bug with filtering by raw bytes" into oc-dev 2017-04-14 23:11:30 +00:00
Eugene Susla
3c9aa1767c [DO NOT MERGE] Fix a bug with filtering by raw bytes 
(when such filter is not provided)
See change in BluetoothDeviceFilterUtils

Bug: 30932767
Test: Call API with a BLE filter with no raw bytes filter, matching some device.
Ensure that the device eventually shows up.

Change-Id: I4397fa33dd0c48771c8a754791a171f2d0bd64eb
 2017-04-14 23:10:20 +00:00
Seigo Nonaka
f08388e8ea Merge "Fix boot loop issue on Android Wear." into oc-dev 
am: 5f9fde884b

Change-Id: Ie73c0cfd4c348d1217338bb40694f20559702bcb
 2017-04-14 22:20:35 +00:00
TreeHugger Robot
5f9fde884b Merge "Fix boot loop issue on Android Wear." into oc-dev 2017-04-14 22:16:22 +00:00
Philip P. Moltmann
ae774ec189 Merge "Fix some racines in AutofillManager" into oc-dev 
am: 2ddd69ce1a

Change-Id: Iec8454a36985484148b821f598446d5305c601bc
 2017-04-14 22:11:06 +00:00
TreeHugger Robot
2ddd69ce1a Merge "Fix some racines in AutofillManager" into oc-dev 2017-04-14 22:04:38 +00:00
Romain Guy
f713a1960e Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev 
am: c99bcc69f7

Change-Id: I016c2b265dc471b74cd703281b3de60d7e54bfea
 2017-04-14 21:14:10 +00:00
Romain Guy
c99bcc69f7 Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev 2017-04-14 21:08:42 +00:00
Romain Guy
fd715c7fbe Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev 
am: 1eaab2db82

Change-Id: I2b843c5f94460f5ee7d9a7767d0411fe6c117a3c
 2017-04-14 21:05:55 +00:00
Jason Monk
389755704e Merge "Convert signal icon to be custom drawable" into oc-dev 
am: 06426bf652

Change-Id: I3fddf788317b91e65c22ec75bb3e6aa0509f64fe
 2017-04-14 20:58:31 +00:00
TreeHugger Robot
1eaab2db82 Merge "Clarify doc for Bitmap.createBitmap()" into oc-dev 2017-04-14 20:53:26 +00:00
Romain Guy
7700c2b238 Merge "Fix API feedback on Color" into oc-dev 
am: 03758701fb

Change-Id: I5b3d30552adedc603a97b65b1f739c19142e70b2
 2017-04-14 20:49:20 +00:00
Mady Mellor
daf76b82ae Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev 
am: 4b7b01c1cc

Change-Id: Ib51c0125042553302584c79a360ee07f2ae1c1b8
 2017-04-14 20:48:02 +00:00
TreeHugger Robot
06426bf652 Merge "Convert signal icon to be custom drawable" into oc-dev 2017-04-14 20:44:19 +00:00
TreeHugger Robot
03758701fb Merge "Fix API feedback on Color" into oc-dev 2017-04-14 20:42:19 +00:00
Mady Mellor
4b7b01c1cc Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev 2017-04-14 20:40:03 +00:00
Nathan Harold
3ce4d95d22 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev 
am: 9361283073

Change-Id: I4ca6b6293dabe856098dda98ce6ca804fa419b44
 2017-04-14 20:28:56 +00:00
Nathan Harold
9361283073 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev 
* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
 2017-04-14 20:21:17 +00:00
Android Build Merger (Role)
7750ab39b2 Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 am: 45bd03914c -s ours" into oc-dev-plus-aosp 2017-04-14 20:11:00 +00:00
Andrew Zeng
1834250bbe Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 
am: 45bd03914c  -s ours

Change-Id: Iadf1027f7bc9d9bc31264341cb6797ae241882fd
 2017-04-14 20:09:46 +00:00
Andrew Zeng
1ba83de49e Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 -s ours 
am: d210ce63d0

Change-Id: Ic2932b7fd206c72de0fe78fd604effd8603cc8e7
 2017-04-14 20:08:35 +00:00
Andrew Zeng
d210ce63d0 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours 
am: 812594f573  -s ours

Change-Id: I54ee864eadfe657ab560c6490a23227532d96b0c
 2017-04-14 20:03:20 +00:00
Andrew Zeng
45bd03914c Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours 
am: 812594f573

Change-Id: Ifb03ad1b13aa59e18ff658f6a0a5779d42d1d226
 2017-04-14 20:02:57 +00:00
Andrew Zeng
812594f573 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev 
am: 2c42db20e4  -s ours

Change-Id: I1c4ddbf044df414cffa282d9e9aba4261b23a975
 2017-04-14 19:52:58 +00:00
Philip P. Moltmann
e048a65639 Fix some racines in AutofillManager 
- The session might be gone by the time the handler is called, hence check
  the sessionID
- Access getClientLocked() and mSession only under mLock.

Test: cts-tradefed run cts-dev AutoFillServiceTestsCases
Change-Id: I445a24557589afadb1f5372b63ef9db88021b609
 2017-04-14 12:50:03 -07:00
Andrew Zeng
2c42db20e4 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev 2017-04-14 19:40:57 +00:00
Adrian Roos
a1da551856 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev 
am: b160141698

Change-Id: I22c165cb1a366e967bebf369ed79eaf86da995a4
 2017-04-14 19:35:31 +00:00
TreeHugger Robot
b160141698 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev 2017-04-14 19:24:40 +00:00
Android Build Merger (Role)
09414003f5 Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am: 28dab313ee" into oc-dev-plus-aosp 2017-04-14 19:10:55 +00:00
Christopher Tate
b5573283ab Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 
am: 28dab313ee

Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11
 2017-04-14 19:09:27 +00:00
Hall Liu
1dd67517ab Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad am: 8fa1c9c899 
am: 00cf4637d2

Change-Id: I257f3ed9143f8d35202f461a0e2522f65c30177b
 2017-04-14 19:06:37 +00:00
TreeHugger Robot
28dab313ee Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 2017-04-14 19:04:35 +00:00
Jason Monk
48edc0c628 Convert signal icon to be custom drawable 
This will make it really easy to change the number of bars it
displays.

Test: runtest systemui
Change-Id: If0b8a606f56430ea08fa0887af85aa0e90de1d40
Fixes: 35902355
 2017-04-14 15:04:09 -04:00
Julia Reynolds
00ac29e3dd Merge "Synchronize access to ranking helper records." into oc-dev 
am: bf777d46f2

Change-Id: I36dec49a567400d1acf6e13567de3f76319f91be
 2017-04-14 18:56:18 +00:00
TreeHugger Robot
bf777d46f2 Merge "Synchronize access to ranking helper records." into oc-dev 2017-04-14 18:52:40 +00:00
Hall Liu
00cf4637d2 Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad 
am: 8fa1c9c899

Change-Id: I148108bcf8636d553852201b0a70e9cfc97d7d44
 2017-04-14 18:43:19 +00:00
Hall Liu
8fa1c9c899 Merge "Helper method in VideoCallImpl for testing" 
am: 14d27fccad

Change-Id: I5e298b40a83041d759e9e5c59d51be0ec5450d11
 2017-04-14 18:39:18 +00:00
Julia Reynolds
7e0a00e387 Merge "Lock access to managed services." into oc-dev 
am: 8ac1452288

Change-Id: I425a6ee8a3f89149e87ce8269d679acc27363793
 2017-04-14 18:34:01 +00:00
Hall Liu
14d27fccad Merge "Helper method in VideoCallImpl for testing" 2017-04-14 18:30:26 +00:00
Matt Sarett
7e92ac449b Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev 
am: 101dc265a8

Change-Id: Ia6d620a6f4df4e7fdbceae5a6f3bc524aae4358e
 2017-04-14 18:29:16 +00:00
TreeHugger Robot
8ac1452288 Merge "Lock access to managed services." into oc-dev 2017-04-14 18:28:38 +00:00
TreeHugger Robot
101dc265a8 Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev 2017-04-14 18:21:46 +00:00
Tsukasa Hashimoto
4ae323995d Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89 
am: 5dbe26f0f1

Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
 2017-04-14 18:19:22 +00:00
Tsukasa Hashimoto
5dbe26f0f1 Merge "Add PID info into ANR crash log header" am: 2fe972c822 
am: 5d57502c89

Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
 2017-04-14 18:13:50 +00:00
Vikas Marwaha
358ec57382 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 
am: e768104f9b

Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
 2017-04-14 18:13:49 +00:00