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

47614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
085baa2cc3 Doc change: Fix scale on highlights screen shots. 
Change-Id: Id2608498baac70dc69d7b716bbb00f0799af03ca
 2011-03-25 19:07:30 -07:00
Andreas Huber
59529e1474 After a seek there's a brief period where audio time isn't reestablished. 
Don't use audio time to trigger a "we're very late, skipping ahead" action
until it's reestablished.

Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1
related-to-bug: 4173683
 2011-03-25 16:40:50 -07:00
Nick Pelly
a585eb17ab am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread 
* commit '14923862577ef785d20fc5c627248897c9eaddb6':
  NfcAdapterExtras: reset singleton state if initialization fails.
 2011-03-25 15:51:42 -07:00
Andreas Huber
e2cb08bd4c am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 
* commit '2fee96bcc057d9b5a9ac912af79fd838f5a42964':
  Make sure we post a video event when seeking after seeing video EOS before.
 2011-03-25 15:40:56 -07:00
Andreas Huber
2fee96bcc0 am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 
* commit '1457ef74d49ee56097ad97cc078e898326beb7db':
  Make sure we post a video event when seeking after seeing video EOS before.
 2011-03-25 15:38:34 -07:00
Andreas Huber
1457ef74d4 Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 2011-03-25 15:33:58 -07:00
Jeff Hamilton
96cf34d362 Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 2011-03-25 14:53:14 -07:00
Adam Powell
7dfc6a9e32 am c8c78eed: am baa3380d: Fix bug 4170809 - Pages with flash lose touch events 
* commit 'c8c78eed52148441a4a549a9a19914bbbde6ad17':
  Fix bug 4170809 - Pages with flash lose touch events
 2011-03-25 14:49:11 -07:00
Andreas Huber
16ede3c535 Make sure we post a video event when seeking after seeing video EOS before. 
Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba
related-to-bug: 3316960
 2011-03-25 14:47:38 -07:00
Adam Powell
c8c78eed52 am baa3380d: Fix bug 4170809 - Pages with flash lose touch events 
* commit 'baa3380d74928baf6a5685c54c719af37171a625':
  Fix bug 4170809 - Pages with flash lose touch events
 2011-03-25 14:45:06 -07:00
Jeff Hamilton
10de0b31df Make STOP_APP_SWITCHES signatureOrSystem. 
The NFC service relies on this permission
for it's dispatching mechanism and it is
no longer signed with the platform cert.

Bug: 4173610
Change-Id: I598ad2889c4af307f04433093923255fe7daedbb
 2011-03-25 16:17:53 -05:00
Adam Powell
baa3380d74 Fix bug 4170809 - Pages with flash lose touch events 
Fix WebView touch cancel behavior when we time out waiting for a
response from webkit.

Change-Id: I0aeeea64b156e204dbe2dda913a42df28704ed16
 2011-03-25 13:58:19 -07:00
Irfan Sheriff
05f14e2bcf Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 2011-03-25 11:01:02 -07:00
James Dong
70a5b0317d am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1 
* commit '9fb98238e5837a68fb16bcb9a23469f27124c304':
  Switch to use SF cached source
 2011-03-25 10:27:05 -07:00
James Dong
9fb98238e5 am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1 
* commit '837430dd3440f6e71f68ef755399e22386dee084':
  Switch to use SF cached source
 2011-03-25 10:24:44 -07:00
James Dong
837430dd34 Merge "Switch to use SF cached source" into honeycomb-mr1 2011-03-25 10:22:57 -07:00
Irfan Sheriff
c0e0dbb454 DO NOT MERGE Pick upstream intf with valid IP conf 
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration

Bug: 3362306
Change-Id: I3e8ab5ef30b69f1adab755d83f5b65c078f73936
 2011-03-25 10:09:55 -07:00
Gloria Wang
ed7b688c01 am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 
* commit 'aac43ea193e0cbd440854f3425579f9ff04abac3':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
 2011-03-25 10:09:09 -07:00
Gloria Wang
aac43ea193 am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 
* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
 2011-03-25 10:05:50 -07:00
Gloria Wang
b8b85ea296 Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 2011-03-25 10:01:37 -07:00
Robert Greenwalt
568845a766 Merge "Fix some alt-network issues." into gingerbread 2011-03-25 09:35:53 -07:00
Robert Greenwalt
7cf5b419da Fix some alt-network issues. 
Two issues.
1) remove default routes for non-default networks.
2) don't report mobile is the active default network just because
   it is active.

bug:4157610
Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
 2011-03-25 08:59:08 -07:00
James Dong
3be1593628 Switch to use SF cached source 
bug - 3500025

Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
 2011-03-25 08:41:57 -07:00
Jeff Hamilton
ad91eee277 am 9c1ef098: Update the value for the NFC shared UID. 
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
 2011-03-24 20:21:41 -07:00
Jeff Hamilton
9c1ef09883 Update the value for the NFC shared UID. 
Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
 2011-03-24 21:39:58 -05:00
Scott Main
9a159217f5 am f54972d0: am cc4b6a61: am 4045e6b9: docs: a11y doc typo 
* commit 'f54972d06006ae73c88811d4a2db00d4919a1c16':
  docs: a11y doc typo
 2011-03-24 14:17:16 -07:00
Scott Main
f54972d060 am cc4b6a61: am 4045e6b9: docs: a11y doc typo 
* commit 'cc4b6a61c6df67c211ac85d49f457fd562abf142':
  docs: a11y doc typo
 2011-03-24 14:11:39 -07:00
Scott Main
cc4b6a61c6 am 4045e6b9: docs: a11y doc typo 
* commit '4045e6b9ab296436cb5344f3af7184c2ce2a8ff0':
  docs: a11y doc typo
 2011-03-24 14:00:47 -07:00
Scott Main
4045e6b9ab docs: a11y doc typo 
Change-Id: Ib4c41c129c8ecbd738dfe6866bd429efdf17c23f
 2011-03-24 13:25:48 -07:00
Gloria Wang
4c87a75073 Fix for bug 4126624. 
Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.

Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
 2011-03-24 13:14:02 -07:00
Scott Main
c6752c370c am c55a6eed: am 119e79cf: am e0b3f2a7: docs: fix a few things in a11y doc 
* commit 'c55a6eed2587f642b2c12ed65f85def7f62d6339':
  docs: fix a few things in a11y doc
 2011-03-24 12:31:02 -07:00
Scott Main
c55a6eed25 am 119e79cf: am e0b3f2a7: docs: fix a few things in a11y doc 
* commit '119e79cf2763592389b4543612400d746bb9aeb2':
  docs: fix a few things in a11y doc
 2011-03-24 12:29:24 -07:00
Scott Main
119e79cf27 am e0b3f2a7: docs: fix a few things in a11y doc 
* commit 'e0b3f2a788e63a10b0fa21bdd700fbcf7e1add34':
  docs: fix a few things in a11y doc
 2011-03-24 12:26:58 -07:00
Scott Main
e0b3f2a788 docs: fix a few things in a11y doc 
Change-Id: I142b0b4498cf6d19655ad1ccc2066e59c39e75a6
 2011-03-24 12:15:35 -07:00
Scott Main
67b2f3f191 am e8eb0f73: am 95cb883c: am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb 
* commit 'e8eb0f732111ff660b36365365fab21c685e1d6b':
  docs: add document for accessibility, authored by Cheryl Simon (clsimon)
 2011-03-24 10:56:49 -07:00
Scott Main
e8eb0f7321 am 95cb883c: am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb 
* commit '95cb883c066b754a96c899b48bd487e2ad0f213d':
  docs: add document for accessibility, authored by Cheryl Simon (clsimon)
 2011-03-24 10:54:08 -07:00
Scott Main
95cb883c06 am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb 
* commit 'b7cfa72932fbb3c794c6e5509b4a5b716236f558':
  docs: add document for accessibility, authored by Cheryl Simon (clsimon)
 2011-03-24 10:51:50 -07:00
Scott Main
b7cfa72932 Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb 2011-03-24 10:49:59 -07:00
Gloria Wang
3c1c3d898c am 480edfb9: am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1 
* commit '480edfb9e0c90ae1ae970a1e5e09640db112803e':
  Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
 2011-03-24 10:43:44 -07:00
Gloria Wang
480edfb9e0 am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1 
* commit 'e2cd33531182b31e0ace2c3acb0e960fbf1ba273':
  Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
 2011-03-24 10:42:14 -07:00
Gloria Wang
e2cd335311 Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1 2011-03-24 10:40:26 -07:00
Bill Gruber
24a5c354f1 am d631dd03: am 6efa3599: am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb 
* commit 'd631dd03ec235300fb323922125b21becfd947ed':
  IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
 2011-03-24 10:35:53 -07:00
Bill Gruber
d631dd03ec am 6efa3599: am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb 
* commit '6efa3599590d3c75a648c3d93353011eb8e30278':
  IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
 2011-03-24 10:33:53 -07:00
Gloria Wang
9e1e9a339e Fix for bug 4165823. 
Add death listener to clean-up drmserver appropriately when drmserver died.
Cherry-pick from master. Do not merge.

Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
 2011-03-24 10:30:57 -07:00
Bill Gruber
6efa359959 am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb 
* commit 'e002734dd2b330ff6f964eeccaf3c6c6207dd9bf':
  IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
 2011-03-24 10:30:30 -07:00
Bill Gruber
e002734dd2 Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb 2011-03-24 10:26:20 -07:00
Bill Gruber
dd8ea580d4 IAB doc updates for final launch plus bug fixes 
Bug: 3491550
Bug: 3491426
Bug: 3407948

Change-Id: I6f02397a62a3f73599ac7ded28e47d9bb1a3d3e9
 2011-03-24 10:23:52 -07:00
Scott Main
ef467c8d95 docs: add document for accessibility, authored by Cheryl Simon (clsimon) 
Change-Id: If4f6e4f12953ae5b608efebde1ac9d3f0720035a
 2011-03-24 10:16:31 -07:00
Bart Sears
35137d6696 am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread 
* commit '6a19759c0fae744e80c032ca3c23932e73e6d9d9':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
 2011-03-24 03:36:31 -07:00
Huahui Wu
772f5bb189 am f440831d: DO NOT MERGE 
* commit 'f440831d76817e837164ca18c7705e81d2391f87':
  DO NOT MERGE
 2011-03-24 03:35:59 -07:00