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

105587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
47aa51d029 am 70b74646: Merge "Track libcore changes." 
* commit '70b74646b8114b7ee9e35ce4283ecab8c8528dcc':
  Track libcore changes.
 2013-06-06 13:53:54 -07:00
Elliott Hughes
70b74646b8 Merge "Track libcore changes." 2013-06-06 20:51:30 +00:00
Elliott Hughes
598a16f71e Track libcore changes. 
Bug: 3484927
Change-Id: I3a3c4a9f0ad6055261f705987bc576cd28bebb46
 2013-06-06 13:40:21 -07:00
Elliott Hughes
4d33a8aba3 am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format" 
* commit 'fa6d6256e9052a5f5155ac97364170f6518e37a4':
  change "next" to "done" in minute IME option under 24-hour format
 2013-06-05 16:23:34 -07:00
Elliott Hughes
fa6d6256e9 Merge "change "next" to "done" in minute IME option under 24-hour format" 2013-06-05 23:20:37 +00: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
Joe Malin
6bf45dc773 am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit 'b6a35268ccb698cde6d2e1e2f475a7299112b034':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:17:15 -07:00
Baligh Uddin
ba82b53dd7 am 26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '26fe0761e3e275347c06f9224e24ab7a31ff23e8':
  Import translations. DO NOT MERGE
 2013-06-03 14:15:52 -07:00
Baligh Uddin
26fe0761e3 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-03 21:14:23 +00:00
The Android Open Source Project
5871434ed6 Reconcile with jb-mr2-release - do not merge 
Change-Id: I29c033be91cbfe80951c043ac96208d894fbda60
 2013-06-03 14:02:50 -07:00
Joe Malin
b6a35268cc B9257437: Typo in javadoc for AccountManager 
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
 2013-06-03 12:20:08 -07:00
Scott Main
dce21a59d9 am 3c080baa: am 564889b1: am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '3c080baad5609faa663238f202c7aae7268bbd2c':
  update dashbord for 6/3
 2013-06-03 11:35:02 -07:00
Scott Main
3c080baad5 am 564889b1: am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '564889b1263bb1c5cfcd21401f853b0cc1569a50':
  update dashbord for 6/3
 2013-06-03 11:33:13 -07:00
Scott Main
564889b126 am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '4a024be4de71f90eaaff7be8122926bdc9297d38':
  update dashbord for 6/3
 2013-06-03 11:17:15 -07:00
Scott Main
4a024be4de am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '4cef8150c83ce60a4d3acc495132357fb9bd1458':
  update dashbord for 6/3
 2013-06-03 11:15:16 -07:00
Scott Main
4cef8150c8 Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 2013-06-03 18:12:54 +00:00
Baligh Uddin
87b2098a8b Import translations. DO NOT MERGE 
Change-Id: I455b359698e9bf43d7065374241783fa1f06faca
Auto-generated-cl: translation import
 2013-06-03 09:11:49 -07:00
Scott Main
aaae94aefa update dashbord for 6/3 
Change-Id: I73f340be032d6a45ccc20c80f03849b018f650e5
 2013-06-03 09:06:19 -07:00
John Spurlock
0f41c05ece am 0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev 
* commit '0c2c62b29d191d41129e3dc5451f07ce0ef6985f':
  Fix awkward wording in AppWidgetManager docs.
 2013-06-03 08:52:56 -07:00
John Spurlock
0c2c62b29d Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev 2013-06-03 15:50:44 +00:00
Andreas Huber
c41a0eff93 am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev 
* commit 'be22605d1eacfb4137b6984b72a3eda004b911a1':
  Listen for HTTP proxy changes and propagate the information to the media
 2013-06-03 08:46:20 -07:00
Andreas Huber
be22605d1e Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev 2013-06-03 15:44:17 +00:00
Robert Greenwalt
530098327c am 05caa2a3: Apply scan-always setting to initial wifi state. 
* commit '05caa2a3de32e54562d1ec3031f73ef5392cfb40':
  Apply scan-always setting to initial wifi state.
 2013-06-03 08:41:48 -07:00
John Spurlock
84a369c33b Fix awkward wording in AppWidgetManager docs. 
Change-Id: Ia06221f75898ab53f97852880bf2a7ec49b4f489
 2013-06-03 11:38:48 -04:00
The Android Automerger
9c7ee73d9c merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-03 05:55:11 -07:00
The Android Automerger
327f639336 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-02 05:55:28 -07:00
Robert Greenwalt
05caa2a3de 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-01 10:59:29 -07:00
Robert Greenwalt
66c7bd5404 am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev 
* commit '0161d229fdbd8407f5b8b783ffa02b145b0cef8e':
  Remember wifi country that's set before boot
 2013-06-01 08:58:16 -07:00
Robert Greenwalt
0161d229fd Merge "Remember wifi country that's set before boot" into jb-mr2-dev 2013-06-01 15:57:12 +00:00
Dirk Dougherty
0f70bcfce3 am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '8ebfb8c9c34caa80cd0d2451d950170c1b522f2a':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:35:13 -07:00
Dirk Dougherty
8ebfb8c9c3 am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'fdc0c8618b4e51c322f747202ff94508124e7c9c':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:32:11 -07:00
Dirk Dougherty
fdc0c8618b am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'b18c725442e498a6447de37c3b9428b09837eda9':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:28:48 -07:00
Wink Saville
ec82a7bde5 am 8ca5d64a: am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 
* commit '8ca5d64a39395ef6d9f800e843ef706c7ab8bf51':
  Fixing crash in PhoneNumberUtils getNumberFromIntent
 2013-06-01 08:27:41 -07:00
Dirk Dougherty
b18c725442 am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'a404a62951ad8a2d657a587feb12780e725296e3':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:26:32 -07:00
Dirk Dougherty
a404a62951 am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '6fe992d88abc1c8c75ede638e6b0d52cd06f098f':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:24:12 -07:00
Jason Sams
d19068a7d2 am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev 
* commit '413adc9260d700bd8143950951c4e1ad07cbeddf':
  Fix free after use with createFromBitmapResource
 2013-06-01 08:23:22 -07:00
Baligh Uddin
14fa7fe20f am 51e01f9e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '51e01f9ec058f34a27de7687ceddf4eb0e6b7d9d':
  Import translations. DO NOT MERGE
 2013-06-01 08:23:19 -07:00
Jim Miller
2542fd54ac am 00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev 
* commit '00d4c94625226ab325def94e9b82074f39572b43':
  Fix keyguard issue where an incoming SMS would switch widget
 2013-06-01 08:23:17 -07:00
Wink Saville
8ca5d64a39 am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 
* commit '39136d391ab04e93fd0a01b760e57b6ea079cf4c':
  Fixing crash in PhoneNumberUtils getNumberFromIntent
 2013-06-01 08:23:02 -07:00
Dirk Dougherty
6fe992d88a am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '4fad5c176a245203c1f8d26397ef6cc838753357':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:21:25 -07:00
Wink Saville
39136d391a Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 2013-06-01 14:09:53 +00:00
Robert Greenwalt
304aad49cd Remember wifi country that's set before boot 
Telehony seems to sometimes be reporting the country before boot
is completed so can't persist the data at that time.  Remember
and write it on BOOT_COMPLETED

Also, there are permission issues around writing the setting.

bug:9225156
Change-Id: Ifdf2243da71b0d2ce5743267842597937d790ef5
 2013-05-31 21:10:15 -07:00
Jason Sams
413adc9260 Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev 2013-06-01 00:54:17 +00:00
Baligh Uddin
51e01f9ec0 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-31 22:30:30 +00:00