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

125636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
53edba8d5c am 571c171e: am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs 
* commit '571c171e6353cafbb98e767c2243a676c30cb8ea':
  Doc change: Update developer video on home page carousel.
 2014-03-14 16:36:23 +00:00
John Spurlock
88f65e01d2 am 4108431b: am 28ac0c10: am ad66c27b: am 6d9b034c: Fix typo in public logcat page. 
* commit '4108431b2e9d66c03daa204689e566b2c2598a95':
  Fix typo in public logcat page.
 2014-03-14 16:36:20 +00:00
Ricardo Cervera
b063df4d27 am c12c92bb: am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs 
* commit 'c12c92bbed3631dfaf9f5975e9b69a4bda300d12':
  docs: Added step to get JDK to the Android Studio install instructions.
 2014-03-14 16:36:17 +00:00
Katie McCormick
e612874b4c am 9c5c5a87: am 8e142bbb: am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs 
* commit '9c5c5a874a2453a9684ad56739f1a779f04e66db':
  Doc update: new doc studio layout editor
 2014-03-14 16:36:14 +00:00
John Spurlock
dc28dc63a7 am 399cac5b: am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit '399cac5b335b7a0a0c0146c6de8b653382caae6a':
  Fix doc typos in AppOpsManager.java
 2014-03-14 16:36:11 +00:00
JP Abgrall
d47dc7c3bd am 7238585e: am 4f261396: am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '7238585e2eea81d416e3e98c283e99c3a9a38a1a':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-14 16:36:08 +00:00
Chad Brubaker
ff9da49462 am 4b59883a: am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '4b59883afd498dd993263c95aa6db84cbe7c49b4':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-14 16:36:04 +00:00
Svetoslav
78a06696b7 am 90119082: am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '9011908230e8c91a580b3ceec2e91059460fe5fb':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 16:36:01 +00:00
Adrian Roos
1b2a09d4d4 am d590516b: am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 
* commit 'd590516b673e1a319099d8d009706d42a61877e0':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-14 16:35:59 +00:00
Baligh Uddin
40716d95ad am 63492522: (-s ours) am 46bfaa1b: (-s ours) am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '634925222ad4528984bf35b9b2316db9a227d51c':
  Import translations. DO NOT MERGE
 2014-03-14 16:35:56 +00:00
Dianne Hackborn
32a9180a6c am f29a4981: am d4981014: am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev 
* commit 'f29a4981616c05f300b582eb09d48ed81c97dd37':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
 2014-03-14 16:35:53 +00:00
Jeff Brown
5988ea8c22 am 88768cc3: am 6adc9602: am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 
* commit '88768cc35789638f16b5a1a9c9de99eb4f6cd408':
  Retain display when creating specialized contexts. (DO NOT MERGE)
 2014-03-14 16:35:51 +00:00
Ricardo Cervera
7890eeff3a am 882ba89b: am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs 
* commit '882ba89bf4aa6046b8f69460f1fe3ad87325e6d8':
  docs: Updated Building your First App tutorial. Bug: 13429905
 2014-03-14 16:32:38 +00:00
Joe Fernandez
571c171e63 am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs 
* commit '58f019a646cb3eecdd3a085eade0824c89b1f80f':
  Doc change: Update developer video on home page carousel.
 2014-03-14 16:32:36 +00:00
John Spurlock
4108431b2e am 28ac0c10: am ad66c27b: am 6d9b034c: Fix typo in public logcat page. 
* commit '28ac0c10ae58a8253db16406b63c37a2ddf94ccf':
  Fix typo in public logcat page.
 2014-03-14 16:32:33 +00:00
Ricardo Cervera
c12c92bbed am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs 
* commit '784aab786c9e6f84d6ae58655f32ce6b3ccfc33f':
  docs: Added step to get JDK to the Android Studio install instructions.
 2014-03-14 16:32:30 +00:00
Katie McCormick
9c5c5a874a am 8e142bbb: am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs 
* commit '8e142bbbe19c2f485033eace102d2e950ceeb4fb':
  Doc update: new doc studio layout editor
 2014-03-14 16:32:27 +00:00
John Spurlock
399cac5b33 am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit '75985bbe2f04519cc663db7ad54e8e69f3eabfc0':
  Fix doc typos in AppOpsManager.java
 2014-03-14 16:32:24 +00:00
JP Abgrall
7238585e2e am 4f261396: am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '4f26139661b0039cff5e570975e6bf9b0bbce1af':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-14 16:32:21 +00:00
Chad Brubaker
4b59883afd am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '7c2b1625d66d3c80c313160f78c8bccd9499539e':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-14 16:32:18 +00:00
Svetoslav
9011908230 am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit '358eaa7825140ee571a7b9d61705fb3adb5b60aa':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 16:32:15 +00:00
Adrian Roos
d590516b67 am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 
* commit '70a0ea0e8de981a2a0c3fb296718256a2355ee2d':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-14 16:32:12 +00:00
Baligh Uddin
634925222a am 46bfaa1b: (-s ours) am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '46bfaa1b93068c78ea5a2ab337ea8b98592b7c10':
  Import translations. DO NOT MERGE
 2014-03-14 16:32:05 +00:00
Dianne Hackborn
f29a498161 am d4981014: am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev 
* commit 'd4981014d486c3ff72813d0d37048ee2abdb3d63':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
 2014-03-14 16:32:02 +00:00
Jeff Brown
88768cc357 am 6adc9602: am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 
* commit '6adc96020f763289d2e2a33b612f2ff237fb40b6':
  Retain display when creating specialized contexts. (DO NOT MERGE)
 2014-03-14 16:31:59 +00:00
Ricardo Cervera
882ba89bf4 am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs 
* commit '506949173761f9bde016b9d74de94df4b63df370':
  docs: Updated Building your First App tutorial. Bug: 13429905
 2014-03-14 16:28:46 +00:00
Joe Fernandez
58f019a646 am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs 
* commit '8bb11153f946a95485644b08a067472735810ef2':
  Doc change: Update developer video on home page carousel.
 2014-03-14 16:28:30 +00:00
John Spurlock
28ac0c10ae am ad66c27b: am 6d9b034c: Fix typo in public logcat page. 
* commit 'ad66c27b9c2f2dce1b9443018a7c4d097bc08fc3':
  Fix typo in public logcat page.
 2014-03-14 16:28:26 +00:00
Ricardo Cervera
784aab786c am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs 
* commit '8714a3437e13b4a403e49c4c624f272dd6dc8f4e':
  docs: Added step to get JDK to the Android Studio install instructions.
 2014-03-14 16:28:22 +00:00
Katie McCormick
8e142bbbe1 am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs 
* commit 'b681794d2583e06693c23eec1af4e282b067abd9':
  Doc update: new doc studio layout editor
 2014-03-14 16:28:18 +00:00
John Spurlock
75985bbe2f am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs 
* commit '62826f55be4415684b4e321469298ba43d598bbb':
  Fix doc typos in AppOpsManager.java
 2014-03-14 16:28:15 +00:00
JP Abgrall
4f26139661 am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev 
* commit '4ecd833ee35d1120f8c1ae52367947cacfc263a4':
  ConnectivityService: add support to set TCP initial rwnd
 2014-03-14 16:28:09 +00:00
Chad Brubaker
7c2b1625d6 am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev 
* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
  Remove SO_BINDTODEVICE from VPN protect
 2014-03-14 16:27:58 +00:00
Svetoslav
358eaa7825 am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev 
* commit 'fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
  PrintSpooler crash if printer is reported to have only one color mode.
 2014-03-14 16:27:55 +00:00
Adrian Roos
70a0ea0e8d am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 
* commit '16858164c73f0696d12161e97bad9cb22c55e603':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-14 16:27:51 +00:00
Baligh Uddin
46bfaa1b93 am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5':
  Import translations. DO NOT MERGE
 2014-03-14 16:27:44 +00:00
Dianne Hackborn
d4981014d4 am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev 
* commit 'e5191aabff5b9b751349b8634836a858af744905':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
 2014-03-14 16:27:40 +00:00
Jeff Brown
6adc96020f am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 
* commit '825dd9dd38a42306d18a627768b16204cf4d8710':
  Retain display when creating specialized contexts. (DO NOT MERGE)
 2014-03-14 16:27:35 +00:00
Zhihai Xu
86dbccae5e am 6d3d6c4a: am 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev 
* commit '6d3d6c4a06a1e83d126622d8a971f439b80ec354':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
 2014-03-14 16:08:38 +00:00
Zhihai Xu
6d3d6c4a06 am 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev 
* commit '57080be98e6c8d33781c619b79731264ab909baf':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
 2014-03-14 16:01:00 +00:00
Zhihai Xu
57080be98e am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev 
* commit 'bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
 2014-03-14 15:56:47 +00:00
Narayan Kamath
1abb7e0f39 am 63938750: am c0232642: am 629daddd: Merge "Fix layoutlib build." 
* commit '6393875024e3b2ee6916d718d79dfbeb722537c1':
  Fix layoutlib build.
 2014-03-14 14:25:58 +00:00
Narayan Kamath
6393875024 am c0232642: am 629daddd: Merge "Fix layoutlib build." 
* commit 'c0232642b74517aa2717673f0811ba65c620f491':
  Fix layoutlib build.
 2014-03-14 14:22:30 +00:00
Narayan Kamath
c0232642b7 am 629daddd: Merge "Fix layoutlib build." 
* commit '629daddd03b598616de7c30a13b1f9f9b11b98fe':
  Fix layoutlib build.
 2014-03-14 07:19:24 -07:00
Narayan Kamath
629daddd03 Merge "Fix layoutlib build." 2014-03-14 14:12:35 +00:00
Narayan Kamath
c73991bda0 Fix layoutlib build. 
Was using private data structures from libcore.

Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
 2014-03-14 14:10:30 +00:00
Dave Platt
6b2b14028d am cb1254f1: am e4e6b3cc: am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients" 
* commit 'cb1254f1abc44b82e2a9da0d9a73230eb46e129e':
  NsdService does not clean up after exiting clients
 2014-03-14 13:13:38 +00:00
Brian Carlstrom
2df4b6a050 am 2facefe6: am 00d115a7: resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp 
* commit '2facefe648996732c61a8a26c76704faa6d20e56':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
 2014-03-14 13:13:34 +00:00
Naofumi Harada
73dca27479 am 0a167a98: (-s ours) am 107041e2: am 03263ce3: am 3b182261: am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '0a167a98658afdb220ffd62b00d2e65d2baed3d3':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-14 10:34:34 +00:00
Chad Brubaker
d361964510 am 0b925975: (-s ours) am 48dd8b0f: am 74f99a4e: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '0b925975b88c91285df97ca26cebb8f8429ec0da':
  Only allow System apps to make VPN exempt routes
 2014-03-14 10:34:30 +00:00