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

104112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xia Wang
ac561b8bdd Merge "Add option to set frequency band" into jb-mr2-dev 2013-06-04 04:23:29 +00: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
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
26fe0761e3 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-03 21:14:23 +00:00
Joe Malin
b6a35268cc B9257437: Typo in javadoc for AccountManager 
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
 2013-06-03 12:20:08 -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
0c2c62b29d Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev 2013-06-03 15:50:44 +00: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
John Spurlock
84a369c33b Fix awkward wording in AppWidgetManager docs. 
Change-Id: Ia06221f75898ab53f97852880bf2a7ec49b4f489
 2013-06-03 11:38:48 -04: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
0161d229fd Merge "Remember wifi country that's set before boot" into jb-mr2-dev 2013-06-01 15:57:12 +00: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
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
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
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
Jim Miller
00d4c94625 Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev 2013-05-31 21:41:34 +00:00
Andreas Huber
d5f9fa574d Listen for HTTP proxy changes and propagate the information to the media 
framework.

related-to-bug: 8873723

Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda
(cherry picked from commit bfe9154142428aa8abecaf943dfeffc55f411ea7)
 2013-05-31 21:33:13 +00:00
Xia Wang
1c6911ac1d Add option to set frequency band 
- The reason to add the test runner is to set frequency band when the runner
  is created which happens before the test activity is actually launch.
  As the test activity will disable/enable wifi when it
  is created, this cycle will ensure the frequency is set successfully.

Change-Id: Ie9de3d8bab3dda7d4bb9ba604ddd5cb33164e397
 2013-05-31 14:10:12 -07:00
Dirk Dougherty
4fad5c176a Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 2013-05-31 21:08:45 +00:00
Jason Sams
3ece2f3268 Fix free after use with createFromBitmapResource 
Bug 9227350

Change-Id: Iee7610a9bf3d9d1baf14b968aed2a7d0876d2af7
 2013-05-31 14:01:04 -07:00
kmccormick
0dc7891ccb am 7356dde4: am a75fb065: am c02821ef: am eca01252: am 3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs 
* commit '7356dde40439e2c787d28ed05aff4ff81d8a2d39':
  Doc Update: fix host title in main doc.
 2013-05-31 13:38:15 -07:00
kmccormick
7356dde404 am a75fb065: am c02821ef: am eca01252: am 3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs 
* commit 'a75fb065aff42ff7671a5b418229294f43da5cf3':
  Doc Update: fix host title in main doc.
 2013-05-31 13:36:43 -07:00
kmccormick
a75fb065af am c02821ef: am eca01252: am 3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs 
* commit 'c02821efde98a62fe9bbfd718847a8c3bd90eea2':
  Doc Update: fix host title in main doc.
 2013-05-31 13:34:09 -07:00
kmccormick
c02821efde am eca01252: am 3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs 
* commit 'eca0125267d453ab60631317a44abe869eb660fe':
  Doc Update: fix host title in main doc.
 2013-05-31 13:32:52 -07:00
kmccormick
eca0125267 am 3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs 
* commit '3886fad5d1c50dd14b11185104401887bc129c7f':
  Doc Update: fix host title in main doc.
 2013-05-31 13:31:23 -07:00
kmccormick
3886fad5d1 Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs 2013-05-31 20:28:57 +00:00
kmccormick
20ec5c5b13 Doc Update: fix host title in main doc. 
Change-Id: Ide683eb651ea7b485dae6c4d348b19a8d988187b
 2013-05-31 12:28:05 -07:00
ztenghui
4f0002e6de Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev 2013-05-31 18:05:43 +00:00
Scott Main
b5a9e73154 am 75e12713: am c1032cca: am ca9948ae: revise migrating to Studio procedure 
* commit '75e12713108954237991960a9e4b0482063bc09c':
  revise migrating to Studio procedure
 2013-05-31 11:00:26 -07:00
Scott Main
75e1271310 am c1032cca: am ca9948ae: revise migrating to Studio procedure 
* commit 'c1032ccae3511de06cf76a700627c41f0b71209e':
  revise migrating to Studio procedure
 2013-05-31 10:58:33 -07:00
Scott Main
c1032ccae3 am ca9948ae: revise migrating to Studio procedure 
* commit 'ca9948ae33e4ffdc057cc8f2b1efef9c38625436':
  revise migrating to Studio procedure
 2013-05-31 10:57:24 -07:00