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

76644 Commits

Author SHA1 Message Date
Svetoslav Ganov
dfcfee7a58 Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev am: 21da54587b 
am: 3b3d9f8415

Change-Id: If448d00811124f5a12d9cae166e2c81a83d13f02
 2017-04-15 00:02:01 +00:00
Roozbeh Pournader
59e987e922 Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev am: 2a05c5edb7 
am: 2ad47527f8

Change-Id: Ib0639bc5e7b5e761d800b3e87915b59cd8523bb0
 2017-04-15 00:00:36 +00:00
Svetoslav Ganov
3b3d9f8415 Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev 
am: 21da54587b

Change-Id: I332d4aeeb7eb14a0b51a60382c8efedf4e1d5375
 2017-04-14 23:34:22 +00:00
Roozbeh Pournader
2ad47527f8 Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev 
am: 2a05c5edb7

Change-Id: I4752951eee34ec5e98368a1b0a68ecb3cbf449cb
 2017-04-14 23:33:01 +00:00
Eugene Susla
ac4e846ccd [DO NOT MERGE] Add an opnion to use advertised name for renaming 
am: 75fb821029

Change-Id: Iead08333400d2ddc0568ae3b7f09f6ccb7fdbc1f
 2017-04-14 23:31:53 +00:00
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
Svetoslav Ganov
21da54587b Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev 2017-04-14 23:22:31 +00:00
TreeHugger Robot
2a05c5edb7 Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev 2017-04-14 23:22:12 +00:00
Eugene Susla
4df89bcb31 [DO NOT MERGE] Fix associations serialization optimization bug 
There mas a missing defensive copy causing false positive detections of
"associations not changed" case, leading to xml file not being updated once
at least one record is present

Bug: 30932767
Test: Associate at least two different devices and ensure the xml has both.
Change-Id: Ic0dc615dd2b847e137555c1084c616831b4dde83
 2017-04-14 23:21:44 +00:00
Eugene Susla
75fb821029 [DO NOT MERGE] Add an opnion to use advertised name for renaming 
Test: Use new API, make sure renaming works
Change-Id: I9251c5db24495b8594fadce2beab3347a1aec884
 2017-04-14 23:19:42 +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
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
TreeHugger Robot
ca1bd4b541 Merge "Add isSmallBatteryDevice flag to ActivityManager." 2017-04-14 22:42:06 +00:00
Philip P. Moltmann
fe48dab741 Merge "Fix some racines in AutofillManager" into oc-dev am: 2ddd69ce1a 
am: ae774ec189

Change-Id: Ic035560141f16118a4fefb3bb0f65edd6bd228cc
 2017-04-14 22:16:02 +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
Marc Hittinger
4affb1edf0 Merge "Add debug property to enable low_ram mode." 2017-04-14 21:19:09 +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
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
Michael Kwan
15eb998e65 Add isSmallBatteryDevice flag to ActivityManager. 
Bug: 37351903
Change-Id: I6fed08c35474b10987388070eafb7b16e6944638
 2017-04-14 12:34:46 -07:00
Christopher Tate
ff2c721bff Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am: 28dab313ee" into oc-dev-plus-aosp 
am: 09414003f5

Change-Id: Ibe8fb54fd2b10227e08d887b69767d472c098b7e
 2017-04-14 19:19:19 +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
TreeHugger Robot
28dab313ee Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 2017-04-14 19:04:35 +00:00
Vikas Marwaha
8b5315f588 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev am: e768104f9b 
am: 358ec57382

Change-Id: I56c2a327f56ec5108f8654907a1a0cc288c9e7d9
 2017-04-14 18:36:10 +00:00
Alan Viverette
14b3375e43 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am: 7c8ab2651b 
am: efc602c307

Change-Id: Id991d413933d8435a05b129bf13e917941371c01
 2017-04-14 18:25:53 +00:00
Alan Viverette
568b59c62c Merge "Update more implementations of findViewById()" into oc-dev am: b7f0db8d89 
am: 2de6b0dab0

Change-Id: I03772206b8849237e1138303229c6ed1c3c2b432
 2017-04-14 18:24:27 +00:00
Chad Brubaker
65cf224a3a Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev am: 8ee12087e6 
am: 4ad2d2b4d0

Change-Id: I784ba8d936046e65bcec1612ba77ff8aaba26975
 2017-04-14 18:18:33 +00:00
Hugo Benichi
61bfec0cbd Merge "ConnectivityManager: release all requests mapping to a callback." am: 1a8f04b1b2 am: 4d80366762 am: e505b37ec5 
am: 9b7453f3c6

Change-Id: I04d6b51bef76c8937227c038c5825ed486812b71
 2017-04-14 18:17:31 +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
Roozbeh Pournader
3f01530a68 Support overriding display locale for SuggestedLocaleAdapter 
The method now accepts a locale for overriding the labels
"Suggested", "All regions", etc.

Fixes: 31257462
Test: Manual
Change-Id: I6e8c95d8d3e7b05a284b171f2cf2819d32e53d8d
 2017-04-14 11:13:27 -07:00
Vikas Marwaha
e768104f9b Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 2017-04-14 18:06:24 +00:00
Andrew Scull
1b67465918 Merge "Service for OEM lock management." into oc-dev am: e52a1bfede 
am: d4be031c76

Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
 2017-04-14 18:01:24 +00:00
Casey Burkhardt
2f44ae57f3 Merge "Icon assets for magnification" into oc-dev am: 4d386d5ce7 
am: 549a439b53

Change-Id: I9cc4e50292a04becf92548ab5be4c54d19736a54
 2017-04-14 17:57:42 +00:00
Hugo Benichi
f24e74942b Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5 am: 4479901ff3 
am: 43cdbc943d

Change-Id: I4f3bd72a8cfa75853474039e7f6e44a5a89bf950
 2017-04-14 17:55:26 +00:00
Jorim Jaggi
7f86cd606d Merge "Make sure theme attributes don't get lost" into oc-dev am: 9d2f03ec5d 
am: 5cf511907d

Change-Id: If65a78ae543335a9f3689e92665cca00e1fd5efd
 2017-04-14 17:54:07 +00:00
Romain Guy
870163ce34 Merge "Fix javadoc typos" into oc-dev am: 4b6e82d237 
am: 299ae2f422

Change-Id: Ifac19d190660a0ce129034794abe20bc5d9066dc
 2017-04-14 17:51:58 +00:00
Andrii Kulian
7ce72dac6d Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev am: c66b6ff997 
am: aa412973d9

Change-Id: I2e6394ce9c7bc72f5aa4de90e294defeb2dbf222
 2017-04-14 17:46:46 +00:00
Svet Ganov
19feef5229 Merge "Allow custom buttons in autofill UI" into oc-dev am: 249c4d709a 
am: 489cef380a

Change-Id: I846ea7cbd275323cf65ed57d37a0acf13b010085
 2017-04-14 17:38:13 +00:00
Dmitry Dementyev
25b5fa9d79 Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp 
am: 0bf753d2e5

Change-Id: I362b107071fc3f9c61a5e183d9a4fdd685ded1d7
 2017-04-14 17:33:46 +00:00
Jeff Sharkey
413a63ef78 Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am: f5d5e5e4bf" into oc-dev-plus-aosp 
am: 224b710a4f

Change-Id: Icdfe9487b2aa1d7d9245aaa87ccde048845b899d
 2017-04-14 17:31:12 +00:00
Svet Ganov
3b436b15b7 Merge "Check for non-null parent before delegating to it am: 3a74243ae4" into oc-dev-plus-aosp 
am: 37933ae25b

Change-Id: I264ce0527b8d4b4cc751487a9c14eda35cf733fe
 2017-04-14 17:23:00 +00:00
Yifan Hong
1ac3406335 Merge "Add Java API for libvintf." into oc-dev am: c223d70e64 
am: 38bf613c0f

Change-Id: I3d2d7c3db36395aa3fcfcbb2396619c46c353d05
 2017-04-14 17:05:01 +00:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
 2017-04-14 17:04:19 +00:00
Jesse Hall
793f0a3963 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev am: 8cafe5d9b4 
am: e20f42b8a9

Change-Id: I5d7df6e69e0f3c1688873cff747d62e5ddd1f78d
 2017-04-14 17:00:13 +00:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Dianne Hackborn
52a29573ee Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am: 676bd21542 
am: 9596d71664

Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f
 2017-04-14 16:48:32 +00:00
Alan Viverette
2de6b0dab0 Merge "Update more implementations of findViewById()" into oc-dev 
am: b7f0db8d89

Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a
 2017-04-14 16:33:14 +00:00
Peng Xu
3242ee7920 Merge "Address review suggestions for sensor direct report related APIs" into oc-dev am: 5ebb159a92 
am: 70004dd19c

Change-Id: I68cbdfa94e98abde8fa0b072605051f3e0ed561d
 2017-04-14 16:28:04 +00:00