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

105626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
a79aaeae55 am 8c1d1b3e: Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev 
* commit '8c1d1b3edff299ca6ef5739e044343b7f2c57f73':
  Maybe fix issue #9296868: Crash in system process
 2013-06-05 15:17:26 -07:00
Dianne Hackborn
8c1d1b3edf Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev 2013-06-05 22:14:39 +00:00
Jeff Brown
b093ea59fe am f8038bdd: Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev 
* commit 'f8038bddcea53d8dfe98e17c5d996b52a8eb5c4e':
  Fix regression in long-press home behavior on tablets.
 2013-06-05 15:03:25 -07:00
Jeff Brown
f8038bddce Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev 2013-06-05 22:00:58 +00:00
Dianne Hackborn
f5fdca9dc1 Maybe fix issue #9296868: Crash in system process 
There were some paths in LocationManagerService where
mRecivers was being accessed/modified without the lock held.
Update method names to indicate they need to be called with
lock held to make it more clear in the future when such a
problem may happen.

Change-Id: Ie2a9d019155ac7cedd1db298caca75b8fe382ca7
 2013-06-05 14:53:33 -07:00
Scott Main
63fcfd5a52 am 06543a45: small cleanup of trigger event javadoc 
* commit '06543a4559b34abf91e34cb44438683e77e7db36':
  small cleanup of trigger event javadoc
 2013-06-05 14:41:51 -07:00
Scott Main
06543a4559 small cleanup of trigger event javadoc 
Change-Id: Ib8a0fc0a7ddac6259cc1bb9e8701b0d570a101c6
 2013-06-05 14:29:50 -07:00
Tim Murray
92b1bd5e6a am 47c892e5: Merge "Update RenderScript API guide." into jb-mr2-dev 
* commit '47c892e5b0224f7088202ecd1ef469556ed29209':
  Update RenderScript API guide.
 2013-06-05 13:46:59 -07:00
Tim Murray
379641a7ef am ea45ab6f: Merge "Improve RS documentation." into jb-mr2-dev 
* commit 'ea45ab6fbc1e45727b08cea0c865f4302a494412':
  Improve RS documentation.
 2013-06-05 13:46:56 -07:00
Tim Murray
47c892e5b0 Merge "Update RenderScript API guide." into jb-mr2-dev 2013-06-05 20:45:00 +00:00
Tim Murray
ea45ab6fbc Merge "Improve RS documentation." into jb-mr2-dev 2013-06-05 20:44:36 +00:00
Winson Chung
18748035bb am 379517b0: Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev 
* commit '379517b0d4d47b45b52b40f09ba0eb1a039cb773':
  Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)
 2013-06-05 11:47:45 -07:00
Winson Chung
379517b0d4 Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev 2013-06-05 18:45:41 +00:00
Tim Murray
015d26837c Update RenderScript API guide. 
bug 8570568
Change-Id: Ib49a63f15ce421115179764a14597b2746a1f2e7
 2013-06-05 11:28:46 -07:00
Tim Murray
c11e25c4e6 Improve RS documentation. 
bug 8570568
Change-Id: I465fcc8ec3e2cc892dc3cb0067aacf5224338102
 2013-06-05 11:28:45 -07:00
Scott Main
0f34894ed8 am aafed1df: add link to required permission from ACTION_RESPOND_VIA_MESSAGE 
* commit 'aafed1df0404e2fb64c1adeb127dc7f300a2c07b':
  add link to required permission from ACTION_RESPOND_VIA_MESSAGE
 2013-06-04 19:38:23 -07:00
Scott Main
aafed1df04 add link to required permission from ACTION_RESPOND_VIA_MESSAGE 
Change-Id: Iafa9c72c9bbd8258c7f961f7ab8ad78c96b61e54
 2013-06-04 19:35:48 -07:00
Jeff Sharkey
ffbbe94506 am d293d229: Merge "Create missing Uids when recording network stats." into jb-mr2-dev 
* commit 'd293d229493a2d661ebb1776a0915297927a5ca6':
  Create missing Uids when recording network stats.
 2013-06-04 16:57:51 -07:00
Jeff Sharkey
d293d22949 Merge "Create missing Uids when recording network stats." into jb-mr2-dev 2013-06-04 23:55:37 +00:00
Baligh Uddin
ba792ed5c3 am 2156c386: Import translations. DO NOT MERGE 
* commit '2156c38622f1cd78e9ad8dba27eb6b3fde939b3c':
  Import translations. DO NOT MERGE
 2013-06-04 15:45:55 -07:00
Baligh Uddin
2156c38622 Import translations. DO NOT MERGE 
Change-Id: I9a9d3071332508b3efbb0bed4eeb435cdc5ba3d9
Auto-generated-cl: translation import
 2013-06-04 15:40:50 -07:00
Winson Chung
eeb4ff4d13 Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309) 
Change-Id: I6cfb8e0c586fad7360a07f98e1280a954f62e5e1
 2013-06-04 14:25:28 -07:00
Jeff Sharkey
51797ed706 Create missing Uids when recording network stats. 
Bug: 5543387
Change-Id: I138c8d2f84e6fd737f2f6ef0945e75ca31256e3d
 2013-06-04 14:09:31 -07:00
Joe Malin
36d0f946ad am e9dff008: am 305cf97b: am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView 
* commit 'e9dff008adc7b6e565402ec61cd89fb3265a28bd':
  DOC CHANGE: Clarify textIsSelectable in TextView
 2013-06-04 10:20:15 -07:00
Joe Malin
e9dff008ad am 305cf97b: am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView 
* commit '305cf97ba7b927f49d3f52952c36cb5102699cc5':
  DOC CHANGE: Clarify textIsSelectable in TextView
 2013-06-04 10:17:46 -07:00
Joe Malin
305cf97ba7 am 60776093: am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView 
* commit '60776093a5569817040e2f65a17893a381906564':
  DOC CHANGE: Clarify textIsSelectable in TextView
 2013-06-04 10:14:48 -07:00
Joe Malin
60776093a5 am 029099ff: am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView 
* commit '029099ff56b92201e10b2047e1ced675c8e9f964':
  DOC CHANGE: Clarify textIsSelectable in TextView
 2013-06-04 10:12:09 -07:00
Joe Malin
029099ff56 am f4b21585: am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView 
* commit 'f4b21585304781c61d00fa6a14a85fae60f6a50d':
  DOC CHANGE: Clarify textIsSelectable in TextView
 2013-06-04 10:09:44 -07:00
Joe Malin
f4b2158530 am 10d96950: DOC CHANGE: Clarify textIsSelectable in TextView 
* commit '10d96950c14ae647c2e8435178533cafc78e1afa':
  DOC CHANGE: Clarify textIsSelectable in TextView
 2013-06-04 10:07:16 -07:00
Scott Main
e125116fc8 am e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-dev 
* commit 'e4ef3849c58225206fd5cba1b33c08968c5e6021':
  javadoc cleanup for audioeffect
 2013-06-04 09:45:32 -07:00
Scott Main
e4ef3849c5 Merge "javadoc cleanup for audioeffect" into jb-mr2-dev 2013-06-04 16:42:23 +00:00
Joe Malin
10d96950c1 DOC CHANGE: Clarify textIsSelectable in TextView 
Change-Id: Iddfdf7ed82ea3fa2a0160bda4a1e29ec8f815a2b
 2013-06-04 09:34:54 -07:00
Xia Wang
af19aef675 am ac561b8b: Merge "Add option to set frequency band" into jb-mr2-dev 
* commit 'ac561b8bdd52a6ac5e4f9b92f1033cd385f149d8':
  Add option to set frequency band
 2013-06-03 21:26:21 -07:00
Xia Wang
ac561b8bdd Merge "Add option to set frequency band" into jb-mr2-dev 2013-06-04 04:23:29 +00:00
Dirk Dougherty
b74c3405b6 am e3e98bc9: am 59b77878: am 63c904c2: am 4c8caaa2: am 5ca78f59: am 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs 
* commit 'e3e98bc966362dd1771ea0d47227223374ad3671':
  Doc change: Add new developer video.
 2013-06-03 19:23:17 -07:00
Dirk Dougherty
e3e98bc966 am 59b77878: am 63c904c2: am 4c8caaa2: am 5ca78f59: am 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs 
* commit '59b77878944f5012fd5a65fc1a845a053220a436':
  Doc change: Add new developer video.
 2013-06-03 19:20:46 -07:00
Dirk Dougherty
59b7787894 am 63c904c2: am 4c8caaa2: am 5ca78f59: am 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs 
* commit '63c904c2d7651089821c4760ab30b71e9000374e':
  Doc change: Add new developer video.
 2013-06-03 19:19:20 -07:00
Dirk Dougherty
63c904c2d7 am 4c8caaa2: am 5ca78f59: am 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs 
* commit '4c8caaa2ef6edc1898a5146cc15eb87c5997d35c':
  Doc change: Add new developer video.
 2013-06-03 19:16:37 -07:00
Dirk Dougherty
4c8caaa2ef am 5ca78f59: am 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs 
* commit '5ca78f5963e49b48896fa866aeb032a37ba15360':
  Doc change: Add new developer video.
 2013-06-03 19:13:46 -07:00
Dirk Dougherty
5ca78f5963 am 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs 
* commit '8e307adcf62c639d25c16f6071d458561ce4bef3':
  Doc change: Add new developer video.
 2013-06-03 19:11:26 -07:00
Dirk Dougherty
8e307adcf6 Merge "Doc change: Add new developer video." into jb-mr1.1-docs 2013-06-04 02:08:21 +00:00
Dirk Dougherty
35592bd6be Doc change: Add new developer video. 
Change-Id: I8af77ee439238133bedeb0396257058f4504f6f7
 2013-06-03 19:05:16 -07:00
Scott Main
1d154187a9 javadoc cleanup for audioeffect 
Change-Id: I87917309d1da6529e16d72ad2b4ec9ce04d10569
 2013-06-03 17:34:29 -07:00
The Android Open Source Project
b18841b442 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ib4adc6b9ad37713ec04b6cacce5279e12395e3a6
 2013-06-03 16:43:47 -07:00
Robert Greenwalt
b0a88e5716 Apply scan-always setting to initial wifi state. 
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.

bug:9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
 2013-06-03 15:03:36 -07:00
Joe Malin
8811154e93 am 423f8a8c: am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '423f8a8c21ec4e702e72ffce27bb3b5481170bae':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:31:21 -07:00
Joe Malin
423f8a8c21 am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '2618ac55a94a97e29abd9defa93dea30e067b4e4':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:27:50 -07:00
Joe Malin
2618ac55a9 am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit 'a37bda7b616452d0072b012cc7ae8fcae51e943f':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:23:08 -07:00
Joe Malin
a37bda7b61 am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '468d82bb7150996c8b2b4228d0e8d031f74e304b':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:20:45 -07:00
Joe Malin
468d82bb71 am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '6bf45dc773de186b68af3cc9fdc275acbd3d86aa':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:18:22 -07:00