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

104095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
ztenghui
34a5b011cd MediaMuxer sample code update, no functional change 
bug:9213533

Change-Id: I0d42ec58576d9fd797dba9c9c9f5ebed1170a818
 2013-05-31 10:50:08 -07:00
Scott Main
ca9948ae33 revise migrating to Studio procedure 
Change-Id: Ic8d2498414ccdbe45b7ce349ecb84925e9830ee9
 2013-05-31 10:42:35 -07:00
Joe Malin
dd51bc3f5b am 13c305e9: am 09bc2f2d: am 7d469061: am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '13c305e944610d4b15f22908fed887f6fdbb42fa':
  Fix #8499531: Command line instructions
 2013-05-31 09:08:29 -07:00
Joe Malin
13c305e944 am 09bc2f2d: am 7d469061: am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '09bc2f2d6449259bbd4820ec33ea7837996612ed':
  Fix #8499531: Command line instructions
 2013-05-31 09:06:39 -07:00
Joe Malin
09bc2f2d64 am 7d469061: am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '7d469061ef7cec751fda3e9d13460d2465395d45':
  Fix #8499531: Command line instructions
 2013-05-31 09:04:23 -07:00
Joe Malin
7d469061ef am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '62ba36096fa14bdc148bbfc85849a7bed44a1b82':
  Fix #8499531: Command line instructions
 2013-05-31 09:03:15 -07:00
Joe Malin
62ba36096f am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '59e24472f3fb4f3dc5d1acee40efd6b8b4d66bd7':
  Fix #8499531: Command line instructions
 2013-05-31 09:02:06 -07:00
Joe Malin
59e24472f3 Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 2013-05-31 16:00:04 +00:00
Jean Chalard
af9e5e5f61 Merge "Improve the documentation for InputConnection." into jb-mr2-dev 2013-05-31 02:44:08 +00:00
Jim Miller
dfb57cdcfc Fix keyguard issue where an incoming SMS would switch widget 
This fixes a bug where an incoming notification from AudioManager
would trigger showAppropriateWidgetPage() to be called even though
nothing has changed.

Fixes bug 9202611

Change-Id: If8bbd30b6b324233b5ad6552183c10cc5a335061
 2013-05-30 18:22:01 -07:00
Jeff Brown
636af7a1cb Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 2013-05-31 00:54:41 +00:00
Joe Malin
98c2e56f8b Fix #8499531: Command line instructions 
Change-Id: I4922855443f1f85e52ad4016ea3e33925c60e08e
 2013-05-30 15:58:23 -07:00
Jeff Brown
14507e257a Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity. 
Bug: 9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
 2013-05-30 14:44:18 -07:00
Scott Main
e302c70643 am c7dda645: am 77da4440: am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit 'c7dda6454fb513676575a9ce2b28112cdab6cb05':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 14:00:16 -07:00
Scott Main
c7dda6454f am 77da4440: am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit '77da444049f526cf702403f2543a26e208bd8c7b':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 13:58:17 -07:00
Scott Main
77da444049 am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit '25a49f9f2e33540dc413210f9dd09c6cec141896':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 13:56:02 -07:00
Scott Main
25a49f9f2e fix IE 7/8 bugs on IO videos page 
Change-Id: I94d47989e8c1075c9864d0a4577434917a7913d7
 2013-05-30 13:51:08 -07:00