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

315202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Pawlowski
5a26c854cd Merge changes from topic 'bt5-cherry-pickery-2' into oc-dev am: 2d7d617e6a 
am: 9688b9b542

Change-Id: I7cc82b62f5336b253cec9b17f700c7e4d7157743
 2017-04-11 20:13:10 +00:00
Fabrice de Gans-Riberi
c8fcac116b Merge "AAPT2: expose return values through JNI." into oc-dev 
am: 3f1febbedb

Change-Id: I2d145aaeb975dfa6abc34f1d5c4e0e9a5708a8b4
 2017-04-11 20:11:40 +00:00
Jakub Pawlowski
e4f6cb0239 Bluetooth 5 fix default AdvertisingSetParameters values am: 1ab569d43f 
am: 7f13a60293

Change-Id: I64a1993b7818817be9a1af1a5b9c777de1fa732c
 2017-04-11 20:11:39 +00:00
Jakub Pawlowski
d30920ac2d Bluetooth: fix comment wording am: 5203f76933 -s ours 
am: d6f6f651ed

Change-Id: I9a2ffc9cc3be4e0565e5ff784bfc89c381552cc6
 2017-04-11 20:10:44 +00:00
Jakub Pawlowski
9688b9b542 Merge changes from topic 'bt5-cherry-pickery-2' into oc-dev 
am: 2d7d617e6a

Change-Id: I1c71f18c7d2c204fac96c047de3bda7759608997
 2017-04-11 20:01:46 +00:00
Jakub Pawlowski
7f13a60293 Bluetooth 5 fix default AdvertisingSetParameters values 
am: 1ab569d43f

Change-Id: I84333cc09b61ebbdf306663966e27e6b42556b85
 2017-04-11 20:00:34 +00:00
Jakub Pawlowski
d6f6f651ed Bluetooth: fix comment wording 
am: 5203f76933  -s ours

Change-Id: I7f16614f63b5f0404c64dce4c4c65c91aba7e902
 2017-04-11 19:59:29 +00:00
Fabrice de Gans-Riberi
3f1febbedb Merge "AAPT2: expose return values through JNI." into oc-dev 2017-04-11 19:56:19 +00:00
Svetoslav Ganov
29beb7f0ce Merge "Keep a removed API to not break GCore presubmit" into oc-dev am: c62250ad52 
am: 436bb48e56

Change-Id: I3aa39f68abe16659760fb243217d2ca84df4d046
 2017-04-11 19:42:22 +00:00
Bill Yi
59bb198665 Import translations. DO NOT MERGE 
Change-Id: I31705e9dbbd23f7e57892e12372a472c903df55e
Auto-generated-cl: translation import
 2017-04-11 12:41:05 -07:00
Jack Yu
05795e1d23 Merge changes into oc-dev-plus-aosp 
am: 24694fffdf

Change-Id: I53c193b28df6446580191ad6887768b80dfdd91c
 2017-04-11 19:36:41 +00:00
Svetoslav Ganov
436bb48e56 Merge "Keep a removed API to not break GCore presubmit" into oc-dev 
am: c62250ad52

Change-Id: I92b682ac25bd6460a0e10237faf6aed081b6c3c6
 2017-04-11 19:35:51 +00:00
Jack Yu
014ba37090 Merge "Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" into oc-dev am: 4011fff255 
am: 0dc7e95b2c

Change-Id: I23dcb38dbd351979de707b94fe03868bba6c4053
 2017-04-11 19:35:27 +00:00
Tyler Gunn
f823135cf3 Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." into oc-dev am: 76679ead10 
am: df719aa347  -s ours

Change-Id: Ie0f22bb31d3a497573df56cc64e854b8fc8e78d7
 2017-04-11 19:33:44 +00:00
Android Build Merger (Role)
24694fffdf Merge changes into oc-dev-plus-aosp 2017-04-11 19:22:17 +00:00
Jack Yu
0dc7e95b2c Merge "Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" into oc-dev 
am: 4011fff255

Change-Id: Ia233a19c30a880ea5631ae37ba0d91d91f49abfa
 2017-04-11 19:21:19 +00:00
Jakub Pawlowski
2d7d617e6a Merge changes from topic 'bt5-cherry-pickery-2' into oc-dev 
* changes:
  Remove enable from PeriodicAdvertisingPariameters (1/2)
  Bluetooth 5 fix default AdvertisingSetParameters values
  Bluetooth: fix comment wording
 2017-04-11 19:19:36 +00:00
Julia Reynolds
73ed76bc6f Allow companion device mgrs channel access 
- Callbacks when channels and groups are modified
- Allow them to read and update channels and groups

Test: runtest systemui-notification
Change-Id: Ie4d02bd4583f71f9faf27603bcc59a1ec0eeaf46
 2017-04-11 19:08:59 +00:00
Adam Lesinski
4f949c3b0b Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev am: fa7b34395c 
am: dc0bdeed94

Change-Id: I99df302aa7987157deceb3ce1fc5e658513e4d7c
 2017-04-11 19:05:52 +00:00
Jeff Sharkey
a4daf89f0f Grant Shell ability to clear cached app data. 
It already has CLEAR_APP_USER_DATA to clear everything inside app
storage, and clearing cached data is a subset of that.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 36731175
Change-Id: Iefc5be6c80e2562a95424fd6fe413bdb018201a9
 2017-04-11 13:03:54 -06:00
Conrad Chen
558acf96db TIF: add TvInputManager methods to notify apps 
Adds TvInputManager methods to notify apps with protected broadcasts
for:
1. Disabling browsable state of preview and watch next programs.
2. Adding preview programs to watch next programs.

Test: build and verify manually to check if notifications are
      broadcasted.
Bug: 35881266

Change-Id: I20fd5b63f42b2c74277315bbbd251b71c649e5c1
 2017-04-11 12:03:04 -07:00
Jorim Jaggi
0e0f0dca1d Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev am: 971fe468a4 
am: 4d384aa34e

Change-Id: Ia4c5959b59e6a76908fbacbcd9768f9836437719
 2017-04-11 18:59:28 +00:00
Svetoslav Ganov
c62250ad52 Merge "Keep a removed API to not break GCore presubmit" into oc-dev 2017-04-11 18:58:56 +00:00
Todd Kennedy
918d3fef69 Merge "add debug logs" into oc-dev am: 7fa473b1aa 
am: 6f590d0913

Change-Id: I55f42ea0f15d271af80192a3e48cc6e20c4a9f75
 2017-04-11 18:58:01 +00:00
Makoto Onuki
1e13f26f80 Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev am: a2ea59c9bb 
am: 538a42da3a

Change-Id: Ia8a8847b3f6033b3256269313806b49d20c21cce
 2017-04-11 18:56:42 +00:00
Jason Monk
ad71ae1fd0 Clean up activity a bit and disable it by default 
Test: visual & demo mode
Change-Id: I3718e7f58d21a28ae937064882c4edff10534701
Fixes: 36020978
 2017-04-11 14:55:25 -04:00
Bill Yi
27c24e679e Merge "Import translations. DO NOT MERGE" into oc-dev am: e62e9a274a -s ours 
am: bef5863ff9  -s ours

Change-Id: I603e5b35909f7f27099874b37b224cc3ab6a2ac9
 2017-04-11 18:55:20 +00:00
Tyler Gunn
df719aa347 Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." into oc-dev 
am: 76679ead10

Change-Id: I80192d01e464e36dc413587d4f776a12a57eba69
 2017-04-11 18:54:59 +00:00
Adam Lesinski
dc0bdeed94 Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev 
am: fa7b34395c

Change-Id: I971b67d5e73b3a45e629212e6a9161c74cff5c72
 2017-04-11 18:49:45 +00:00
Jack Yu
4011fff255 Merge "Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" into oc-dev 2017-04-11 18:45:34 +00:00
Bill Yi
6104b8ac65 Import translations. DO NOT MERGE 
Change-Id: I00ba119096a1178627988e15ec6e71f637b2ac57
Auto-generated-cl: translation import
 2017-04-11 11:41:51 -07:00
Roozbeh Pournader
7c33271ce6 Merge "Update fontchain_lint to test new emoji font" into oc-dev am: f72b0eec6e 
am: 028312c74c

Change-Id: I64a8fadde3a5cd1d26e2b244073bc9c3980340f9
 2017-04-11 18:40:26 +00:00
Svet Ganov
fc4a3004e3 Keep a removed API to not break GCore presubmit 
Change-Id: Ica38b7aad2a5a8792917d0da1d497f373b118077
 2017-04-11 11:40:14 -07:00
Tyler Gunn
76679ead10 Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." into oc-dev 2017-04-11 18:37:03 +00:00
Dan Willemsen
2438c392ff Merge "Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: 4a43598bd6 am: 73def9c0f9 am: f63f5c745e -s ours" into oc-dev-plus-aosp 
am: a18fcb282b  -s ours

Change-Id: I61da2959265e2c8319fce2ada5dc0b5dccfae587
 2017-04-11 18:33:45 +00:00
Jorim Jaggi
4d384aa34e Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev 
am: 971fe468a4

Change-Id: Id22f93bb9250f587c678a401fa57507784a58ebc
 2017-04-11 18:30:18 +00:00
Adam Lesinski
fa7b34395c Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev 2017-04-11 18:30:00 +00:00
Todd Kennedy
6f590d0913 Merge "add debug logs" into oc-dev 
am: 7fa473b1aa

Change-Id: I1ea353968caff9d4e1ce2ef56267a40e3801be14
 2017-04-11 18:29:02 +00:00
Bill Yi
7b329f6c9d Import translations. DO NOT MERGE 
Change-Id: I20af9c4b4177a5a36496e76c70870b4792944f2c
Auto-generated-cl: translation import
 2017-04-11 11:28:05 -07:00
Bill Yi
7c22c80a38 Import translations. DO NOT MERGE 
Change-Id: I12715892d9848e7a1efac7a7cd990baad91ad550
Auto-generated-cl: translation import
 2017-04-11 11:20:51 -07:00
Mathieu Chartier
1de37df554 Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" 2017-04-11 18:16:23 +00:00
TreeHugger Robot
971fe468a4 Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev 2017-04-11 18:16:00 +00:00
Todd Kennedy
7fa473b1aa Merge "add debug logs" into oc-dev 2017-04-11 18:14:23 +00:00
Wale Ogunwale
7004a8801d Ensure visible activities when device is unlocked. 
When the device is locked we transition all activities to the stopped
state. However, we were only resuming the activity in the focused stack
when the device is unlocked. We now:
- Ensure all visible acitvities when the device is unlocked regardless
of stack.
- If the activity is marked as visible, but in the STOPPED state, we go
ahead and restart it.
- Correctly set ActivityRecord.stopped to false when we restart an
activity into the PAUSED state.

Fixes: 37119770
Bug: 37244415
Test: Make sure docked activity state isn't STOPPED when device is
unlocked.

Change-Id: I1498eeddaa3c1f5dd5135dca56271ffc22b704f2
 2017-04-11 11:13:04 -07:00
Makoto Onuki
538a42da3a Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev 
am: a2ea59c9bb

Change-Id: Ic9eebe67290f7dcd7ff59bb40c81d39bf2a8d82d
 2017-04-11 18:11:20 +00:00
Bill Yi
bef5863ff9 Merge "Import translations. DO NOT MERGE" into oc-dev 
am: e62e9a274a  -s ours

Change-Id: Ib0cef189f301d3a79b75aa610994dc59d441ab81
 2017-04-11 18:09:45 +00:00
Mathieu Chartier
94f11c531f Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING 
dalvik-data-code-cache and dalvik-CompilerMetadata should be counted
in JITCache instead of .GC in dumpsys.

Bug: 37224159
Test: adb shell dumpsys meminfo -d

(cherry picked from commit 874c4cf56c0a9ea3b48468a13ec7fb78a3e2594b)

Change-Id: I41def949d91b2fdef0b3f502fe16ae436d058051
 2017-04-11 11:07:37 -07:00
Dan Willemsen
5691f5987f Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: 4a43598bd6 am: 73def9c0f9 am: f63f5c745e -s ours 
am: 64627aeb45  -s ours

Change-Id: Ie8fef6948de8cc28c3fb9bd08615b5cab237dd1c
 2017-04-11 18:00:31 +00:00
Jason Monk
e2e4281a3f Merge "Fix screen pinning in seascape" into oc-dev am: d24ecd9b5c 
am: 2ec5bc3246

Change-Id: I0392508f2248f006c3ab849ec862a87555371f63
 2017-04-11 17:57:05 +00:00
Roozbeh Pournader
028312c74c Merge "Update fontchain_lint to test new emoji font" into oc-dev 
am: f72b0eec6e

Change-Id: Ie4e8d0621e8b5d133248f457c3a734ef035d7b80
 2017-04-11 17:55:45 +00:00