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

297958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
2f48a6ce63 DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours am: 836b54e6bb am: 383e0cfa06 
am: a55258bd17

Change-Id: Idc5bde3158245925645d1ab69115df561922a758
 2016-12-02 20:17:33 +00:00
TreeHugger Robot
3eda32cc71 Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev 
* changes:
  Add capability flag for 802.11r fast BSS transition
  Add constants for 802.11r
 2016-12-02 20:14:11 +00:00
Jakub Pawlowski
c977c776c2 Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev 
* changes:
  BLE OOB Pairing - parse address type (5/5)
  Fix Bluetooth OOB pairing not working for unseen devices
  Add LE Secure Connection data parsing (1/4)
 2016-12-02 20:14:03 +00:00
Jeff Sharkey
4aacfce724 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours am: f199d511c3 
am: 1d752340a7

Change-Id: Ie7b1d07a622a9b5be4e0d5d9b08b33b821b8e43a
 2016-12-02 20:11:33 +00:00
Jeff Sharkey
6786309c03 DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours am: 0eaa192436 
am: 43b3a13803

Change-Id: I5f4f250100c3b9f63149add16f0086c77ccdf7ca
 2016-12-02 20:10:37 +00:00
Jeff Sharkey
d12e48494d Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours am: 3fa188bd8f 
am: 09960bdfcc

Change-Id: Ib66ff9a9e82f9ed3e7e291c0bcca1be9d4f38805
 2016-12-02 20:09:34 +00:00
Jeff Sharkey
2bf8e5abcb Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev am: 2e73db5b9c 
am: 1157adb305

Change-Id: Ibf843248b74237e380bd1c5c79999117b0b2efbd
 2016-12-02 20:08:38 +00:00
Jeff Sharkey
a55258bd17 DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours am: 836b54e6bb 
am: 383e0cfa06

Change-Id: I231c3a499177db213b0406ea84e7ea3c224f132d
 2016-12-02 20:08:37 +00:00
Android Build Merger (Role)
18735cc1a5 Merge "Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev am: 2e73db5b9c" into nyc-mr1-dev-plus-aosp am: ed09e67751" into nyc-mr2-dev-plus-aosp 2016-12-02 20:02:07 +00:00
Android Build Merger (Role)
24ce7d651f Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev am: 2e73db5b9c am: 0e673a8143" into nyc-mr2-dev-plus-aosp 2016-12-02 20:01:48 +00:00
Jeff Sharkey
9397f3c366 Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev am: 2e73db5b9c" into nyc-mr1-dev-plus-aosp 
am: ed09e67751

Change-Id: I342e3f3e3d9dd7baed396a01df5a2f55e956d5bd
 2016-12-02 20:01:12 +00:00
Jeff Sharkey
e1f2060eab Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev am: 2e73db5b9c 
am: 0e673a8143

Change-Id: Ia4b77f2c50c89ac555880acf28eea28f8bc355a3
 2016-12-02 20:01:07 +00:00
Android Build Merger (Role)
6cb8cff20a Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8" into nyc-mr1-dev-plus-aosp am: a2a069e998" into nyc-mr2-dev-plus-aosp 2016-12-02 20:00:40 +00:00
Android Build Merger (Role)
3ef390afb2 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8 am: 95d6c7e59a" into nyc-mr2-dev-plus-aosp 2016-12-02 20:00:18 +00:00
Jeff Sharkey
8a97e90f9c Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8" into nyc-mr1-dev-plus-aosp 
am: a2a069e998

Change-Id: Iade0f5f736c2cce1539117d86ec9483d405b67e8
 2016-12-02 19:59:42 +00:00
Jeff Sharkey
50a914886c Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8 
am: 95d6c7e59a

Change-Id: Ic0aa44fa241f771f65cc3d1c3f67e7f5ca23328c
 2016-12-02 19:59:38 +00:00
Android Build Merger (Role)
2282ec207f Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d" into nyc-mr1-dev-plus-aosp am: ec7e6c33d7" into nyc-mr2-dev-plus-aosp 2016-12-02 19:59:16 +00:00
Android Build Merger (Role)
214b523a6a Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d am: b09bcc7328" into nyc-mr2-dev-plus-aosp 2016-12-02 19:58:58 +00:00
Jeff Sharkey
5697bc0dfc Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d" into nyc-mr1-dev-plus-aosp 
am: ec7e6c33d7

Change-Id: I0433ba9b9f5e9becfcbad63aeada156e49c28bd3
 2016-12-02 19:58:20 +00:00
Jeff Sharkey
bfd33d0377 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d 
am: b09bcc7328

Change-Id: I3ce2a8af99fa9229bb373eb59686bc4a5a760319
 2016-12-02 19:58:12 +00:00
Android Build Merger (Role)
0c7267b698 Merge "Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969" into nyc-mr1-dev-plus-aosp am: 2bfad25b06" into nyc-mr2-dev-plus-aosp 2016-12-02 19:57:37 +00:00
Android Build Merger (Role)
89ecf83fa6 Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: 0af2fdee40" into nyc-mr2-dev-plus-aosp 2016-12-02 19:57:19 +00:00
Android Build Merger (Role)
0596e4f267 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8 am: 9ce28af49c" into nyc-mr2-dev-plus-aosp 2016-12-02 19:57:16 +00:00
Jeff Sharkey
3d83246be3 Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969" into nyc-mr1-dev-plus-aosp 
am: 2bfad25b06

Change-Id: I3945f337de1d941779a5f5018a86c87ca494bc9e
 2016-12-02 19:56:42 +00:00
Jeff Sharkey
ec4dfe1584 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8 
am: 9ce28af49c

Change-Id: I3769d3e20e8eba1859b87386d67cebec3ab4b436
 2016-12-02 19:56:37 +00:00
Jeff Sharkey
a5b6631392 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 
am: 0af2fdee40

Change-Id: Ie3a3686ab2013859300609ac06a1fe64fbd5873b
 2016-12-02 19:56:32 +00:00
Android Build Merger (Role)
05c36cb1ca Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d am: f196c044f3" into nyc-mr2-dev-plus-aosp 2016-12-02 19:56:07 +00:00
TreeHugger Robot
0730df7369 Merge "Allow some app windows to display above the IME." 2016-12-02 19:55:52 +00:00
Android Build Merger (Role)
c0e91458bf Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp am: 30aca837c8" into nyc-mr2-dev-plus-aosp 2016-12-02 19:55:52 +00:00
Android Build Merger (Role)
6cbcfe78c9 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: 0ae6bb63ea" into nyc-mr2-dev-plus-aosp 2016-12-02 19:55:31 +00:00
Jeff Sharkey
80328894a6 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d 
am: f196c044f3

Change-Id: Ice4d59eb90c422903b88ec8870ea0dbcffdd9e45
 2016-12-02 19:55:29 +00:00
Jeff Sharkey
1d752340a7 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02 -s ours 
am: f199d511c3

Change-Id: I990a5459cd64bbc0e2ede2d3b5899163d12818f4
 2016-12-02 19:55:09 +00:00
Android Build Merger (Role)
70c962bdd6 Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: d01f22d0b2" into nyc-mr2-dev-plus-aosp 2016-12-02 19:55:01 +00:00
Jeff Sharkey
811f10c209 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp 
am: 30aca837c8

Change-Id: I376248947975df72dd8e597f2ed17d469e58c39e
 2016-12-02 19:54:49 +00:00
Jeff Sharkey
d9a1804962 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 
am: 0ae6bb63ea

Change-Id: I54329c81374eff14c24984bfa606e53e67e64355
 2016-12-02 19:54:38 +00:00
Jeff Sharkey
7d72a117ef DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 
am: d01f22d0b2

Change-Id: I5c2448b22546d9cc0582b1d0fcc2d8090cc41dee
 2016-12-02 19:54:22 +00:00
Jeff Sharkey
43b3a13803 DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a am: acfda3d71a -s ours 
am: 0eaa192436

Change-Id: Ie0fe9fd6770c94d56b3af10902c44c52d9a2f2a3
 2016-12-02 19:54:12 +00:00
Android Build Merger (Role)
29c4a517fe Merge "Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp am: fb9a16a3f3" into nyc-mr2-dev-plus-aosp 2016-12-02 19:54:01 +00:00
Android Build Merger (Role)
b249844ee2 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: b46e9bb9cb" into nyc-mr2-dev-plus-aosp 2016-12-02 19:53:52 +00:00
Android Build Merger (Role)
545b2f2083 Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: 45ba8593c0" into nyc-mr2-dev-plus-aosp 2016-12-02 19:53:42 +00:00
Jeff Sharkey
fc532f77fc Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 
am: b46e9bb9cb

Change-Id: I68c9a03a42a89530aeadc25aa601bbdef7ebc78c
 2016-12-02 19:53:13 +00:00
Jeff Sharkey
09960bdfcc Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4 -s ours 
am: 3fa188bd8f

Change-Id: Ibae31cd6439c2fdfcc9d333ca23bd466a7730218
 2016-12-02 19:53:09 +00:00
Jeff Sharkey
84938307a9 Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp 
am: fb9a16a3f3

Change-Id: I3a8f1049cb6cbf2b2885943fbea7dba31364234a
 2016-12-02 19:53:00 +00:00
Jeff Sharkey
736acb1073 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e 
am: 45ba8593c0

Change-Id: I2040801dcb090ea635e5840232130d69ee14aef8
 2016-12-02 19:52:56 +00:00
Android Build Merger (Role)
c91876dcf3 Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: dd09c12a61" into nyc-mr2-dev-plus-aosp 2016-12-02 19:52:53 +00:00
Jeff Sharkey
e98f3f4d08 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e 
am: dd09c12a61

Change-Id: I724f1a005adb3c743daa974228838eff0ec9cca2
 2016-12-02 19:52:06 +00:00
Jeff Sharkey
383e0cfa06 DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc -s ours 
am: 836b54e6bb

Change-Id: Ib546b18b5373aaf8e429a3e8668a23a9d3b5c411
 2016-12-02 19:52:04 +00:00
Jaekyun Seok
195caa6696 Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db 
am: ae21f6f5b0

Change-Id: Ie0306a1e3dc80f6ee6ad9669b91d150167b04586
 2016-12-02 19:51:59 +00:00
Jeff Sharkey
1157adb305 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev 
am: 2e73db5b9c

Change-Id: I0d230d279eb3fad10e46dbb3c469d770a80482e8
 2016-12-02 19:51:21 +00:00
Android Build Merger (Role)
ed09e67751 Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9" into cw-f-dev am: 2e73db5b9c" into nyc-mr1-dev-plus-aosp 2016-12-02 19:49:22 +00:00