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

108198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
6db1054692 am 7d1fd557: am 372d21ad: am 6706ca96: Merge "Update HttpResponseCache to use the new cache API." 
* commit '7d1fd557a3fd96365565531e5e45ac5e93dd8315':
  Update HttpResponseCache to use the new cache API.
 2013-06-13 02:34:23 -07:00
Narayan Kamath
7d1fd557a3 am 372d21ad: am 6706ca96: Merge "Update HttpResponseCache to use the new cache API." 
* commit '372d21ad69a43e3d0a26b23f45351511ed88e9e6':
  Update HttpResponseCache to use the new cache API.
 2013-06-13 02:31:51 -07:00
Narayan Kamath
372d21ad69 am 6706ca96: Merge "Update HttpResponseCache to use the new cache API." 
* commit '6706ca96b21ebbd620fb597a23e8180f76bb37cf':
  Update HttpResponseCache to use the new cache API.
 2013-06-13 02:29:11 -07:00
Narayan Kamath
6706ca96b2 Merge "Update HttpResponseCache to use the new cache API." 2013-06-13 09:26:34 +00:00
Adam Powell
b44d66fa8e Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
This reverts commit ef2277ec5802143b8af1da32d7b01518401b97a9.

This caused a regression for some apps relying on the old behavior.

Bug 9372495
 2013-06-12 23:26:35 -07:00
Dave Burke
2ce9bae80c am bafc8dcf: am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev 
* commit 'bafc8dcf690776ec7fdcf26518f3aff47724871d':
  Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
 2013-06-12 21:13:51 -07:00
Dave Burke
bafc8dcf69 am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev 
* commit '34bc73dff1f0c8402da3fc9bd1f0175bddcaa842':
  Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
 2013-06-12 21:11:12 -07:00
Dave Burke
34bc73dff1 Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev 2013-06-13 04:08:42 +00:00
Jeff Brown
aab3453965 Fix logspam when battery sysfs file not available. 
This was a regression caused by a recent change to use String8
instead of char*.  We missed the implicit null check here.

Bug: 9377604
Change-Id: I7eff138096622c47b5d45678010373dc82138384
 2013-06-12 20:55:08 -07:00
Craig Mautner
9e105e0a9a Add debug for specific bug. 
To be removed once the bug is fixed.

Change-Id: I83bd5b9fd722826c59b1178303fc4e7feb8eefd2
 2013-06-12 20:19:00 -07:00
kmccormick
95acc52c79 am 40609ff0: am 4b5a6255: am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '40609ff0fdcbebc6bd86fca3bcf81293dd59fb74':
  Doc update: restoring deprecation messages
 2013-06-12 19:40:58 -07:00
kmccormick
40609ff0fd am 4b5a6255: am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '4b5a6255e096b20513468cc1f55f3038c4c53327':
  Doc update: restoring deprecation messages
 2013-06-12 19:38:51 -07:00
kmccormick
4b5a6255e0 am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit 'e9abc5e935deab1c63f89971380b9f9a9eed1af9':
  Doc update: restoring deprecation messages
 2013-06-12 19:35:56 -07:00
kmccormick
e9abc5e935 am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit 'b89c6ac4e65c0aaadddd65d1f816860681615b1e':
  Doc update: restoring deprecation messages
 2013-06-12 19:33:50 -07:00
kmccormick
b89c6ac4e6 am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '9af7d4072849de24a0ac6401247c18c6ef915e2f':
  Doc update: restoring deprecation messages
 2013-06-12 19:31:12 -07:00
kmccormick
9af7d40728 am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '227615eeb7b6008e18d2b205cadccf4943a82e94':
  Doc update: restoring deprecation messages
 2013-06-12 19:28:58 -07:00
kmccormick
227615eeb7 am bf370185: Doc update: restoring deprecation messages 
* commit 'bf3701854841f97f52cd29b601431861598f5277':
  Doc update: restoring deprecation messages
 2013-06-12 19:26:57 -07:00
kmccormick
bf37018548 Doc update: restoring deprecation messages 
Change-Id: I58ca2002043d47cc55f15cdaff581e019a6dd7ef
 2013-06-12 19:15:58 -07:00
Dianne Hackborn
439e9bc85d Fix some things. 
Change-Id: I7dacf11cdb356cad5f9bc013b19f2e14f31cb75f
 2013-06-12 19:13:49 -07:00
Dianne Hackborn
2d96d67ca2 Merge "Add scheme specific part to IntentFilter." 2013-06-13 02:10:20 +00:00
Dirk Dougherty
4d244e5f2b am 1e00aa87: am fa42499b: am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit '1e00aa877bf23b0220efd15af60de959a1f300e8':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:46:48 -07:00
Dirk Dougherty
1e00aa877b am fa42499b: am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit 'fa42499bd51cb07e54c90d21ce80e4d6a8c04e41':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:44:34 -07:00
Dirk Dougherty
fa42499bd5 am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit '14ef5964255730a838301d3eb7ab38a2eb745ba6':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:41:25 -07:00
Dirk Dougherty
14ef596425 am 5161fdf3: am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit '5161fdf3039c4e31e498c259ca4bffae18d99331':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:39:11 -07:00
Dirk Dougherty
5161fdf303 am e5bde8e0: am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit 'e5bde8e03574a17fea7c078ee00fb882eb3ec829':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:36:31 -07:00
Dirk Dougherty
e5bde8e035 am bd9e41ba: am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit 'bd9e41ba72014c7412f69cafbeb775c281a36d3b':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:34:24 -07:00
Fabrice Di Meglio
f649a06e6b Merge "Fix bug #9302365 HorizontalScrollView is not RTL aware" 2013-06-13 01:32:45 +00:00
Dirk Dougherty
bd9e41ba72 am fe3da794: Doc change: refresh gcore/gms reference from e-release. 
* commit 'fe3da794f7fb26325951338b1951bb6fdbbc0199':
  Doc change: refresh gcore/gms reference from e-release.
 2013-06-12 18:31:26 -07:00
Kristian Monsen
a5512f2e0e Merge "Add javadoc to Handler.Callback.handleMessage" 2013-06-13 01:24:50 +00:00
Romain Guy
7112fddbe2 Merge "Restore buildLayer()'s old behavior; it's synchronous again Bug #9193833" 2013-06-13 01:19:46 +00:00
Fabrice Di Meglio
fafe88c3d9 Fix bug #9302365 HorizontalScrollView is not RTL aware 
- follow up for cleaning the state

Change-Id: I850d0da5ff8813d1c7a6f2277bddba1b8ccc07ec
 2013-06-12 18:18:08 -07:00
Jeff Sharkey
61277dfcd9 Protect more system broadcasts. 
Bug: 8877514
Change-Id: Iaff8a5fbfab2c48bf26ce611fe2caff4f22d9152
 2013-06-12 18:16:01 -07:00
Dianne Hackborn
df1c0bf774 Add scheme specific part to IntentFilter. 
Change-Id: I063d086cdc742800b8e31ddf2942f2e9230e2785
 2013-06-12 18:08:17 -07:00
Dirk Dougherty
fe3da794f7 Doc change: refresh gcore/gms reference from e-release. 
Change-Id: Ic9455b2ba0142cf310a2a509f706d90b5553fbf4
 2013-06-12 18:06:08 -07:00
The Android Open Source Project
512d8fbe51 am e2ae0111: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'e2ae01114dac2abecf3aeed1d6fb13bdcfb93a7b':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Allow carrier provisioning to turn toggle radio power.
  Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)
 2013-06-12 18:06:06 -07:00
The Android Open Source Project
e2ae01114d Reconcile with jb-mr2-release - do not merge 
Change-Id: Icee761e7873b6c14395d33c06ad53f5bff480839
 2013-06-12 18:04:15 -07:00
Fabrice Di Meglio
b57e2e3872 Merge "Save Scroller position" 2013-06-13 00:54:37 +00:00
Dirk Dougherty
f6f0bc7453 am 80d56531: am 95793530: am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '80d56531103249f103d7cb680cd431b059ff1d43':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:47:59 -07:00
Dirk Dougherty
80d5653110 am 95793530: am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '9579353081f4857c6a9672675dca22182b588e31':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:45:53 -07:00
Dirk Dougherty
9579353081 am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '2b336ce4d8f740715a5b2f2cc8fb07a99300ce73':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:43:07 -07:00
Fabrice Di Meglio
d6befbdd17 Save Scroller position 
- add SaveState with scroll position and use it during the first layout

Change-Id: I0806ddb9c52d70d32055f4b474d21f6e2e5a4ea8
 2013-06-12 17:42:14 -07:00
Dirk Dougherty
2b336ce4d8 am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '94e207b95799125dcc6ea65eb68697a6568579a3':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:40:06 -07:00
Adam Powell
fc93d0c108 Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
This reverts commit ef2277ec5802143b8af1da32d7b01518401b97a9.

This caused a regression for some apps relying on the old behavior.

Bug 9372495
 2013-06-12 17:38:25 -07:00
Dirk Dougherty
94e207b957 am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '3574bef4625402a99224a9c1051b295ed9fa0645':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:37:26 -07:00
Chris Craik
149b015db9 Merge "Overdraw avoidance and merging of clipped ops" 2013-06-13 00:37:02 +00:00
Chris Craik
af0fa4fd73 Merge "Remove crash workarounds, add logging" 2013-06-13 00:36:37 +00:00
Dirk Dougherty
3574bef462 am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '47f5c4102d096c56f9ebc71bdb351b58cfb8de42':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:35:17 -07:00
Dirk Dougherty
47f5c4102d am 57bb89f0: Doc change: Add docs for GP Purchase Status API. 
* commit '57bb89f0b267140ae7f50e31ec0e3023e8836639':
  Doc change: Add docs for GP Purchase Status API.
 2013-06-12 17:33:37 -07:00
Fabrice Di Meglio
4d5c4e21d3 Merge "Fix bug #9302365 HorizontalScrollView is not RTL aware" 2013-06-13 00:27:13 +00:00
Jeff Brown
af732317e4 am 18c3bbfb: am a37c3f18: Merge "Fix logspam when battery sysfs file not available." into jb-mr2-dev 
* commit '18c3bbfb7840f465ffa292f49d98c3b617dea1e5':
  Fix logspam when battery sysfs file not available.
 2013-06-12 17:05:10 -07:00