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

68485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
e0afc34128 Whoops forgot this change. 
Should have been creating a few more processes.

Change-Id: I59d8c89c989fff7965122c5a9d798138ef156857
 2012-02-29 12:37:59 -08:00
Gilles Debunne
8279570b22 Fix for broken build part 2. Update 16.txt too 
Change-Id: I8609dd818a6e4059f9b149a8089d681ac2972d66
 2012-02-28 16:36:45 -08:00
Gilles Debunne
c1a1a49540 Fix for broken build. update-api step missing. 
Change-Id: Ia8d3c92825cfdca8b8eef1c1badd1b514ceef18e
 2012-02-28 16:31:38 -08:00
Robert Ly
c02859f6eb am 246a1bee: am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit '246a1bee9d5db1db3c91e0886b514598763193dd':
 2012-02-28 15:48:12 -08:00
Robert Ly
e6c118b5d0 am 61a9a83a: am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit '61a9a83ac09246f815806fa4f64cc65a7e876f96':
  fix bug 5911175
 2012-02-28 15:45:40 -08:00
Robert Ly
246a1bee9d am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'edfc6a0d709afdf75284ecfc1e680c27fda8b9a9':
 2012-02-28 15:43:52 -08:00
Robert Ly
61a9a83ac0 am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit '40226da7aeb705fb823517f74739bf2f25fa86f3':
  fix bug 5911175
 2012-02-28 15:42:32 -08:00
Robert Ly
edfc6a0d70 am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
 2012-02-28 15:39:55 -08:00
Robert Ly
40226da7ae am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
 2012-02-28 15:39:39 -08:00
Robert Ly
f4994b3eb0 Merge "fix bug 5911175" into ics-mr1 2012-02-28 15:37:21 -08:00
Gilles Debunne
3e804a615d Merge "Removed TextAlign in TextView" 2012-02-28 15:32:04 -08:00
Dianne Hackborn
b391f2e0b6 am 11f343c6: am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '11f343c6b1b6a420c0a375edbb7c35d2fdb32482':
 2012-02-28 15:19:19 -08:00
Dianne Hackborn
11f343c6b1 am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit 'c221d6ec2fbaa73f82cd219e2d5ab078697070ab':
 2012-02-28 15:16:20 -08:00
Jeff Sharkey
8097e1c567 Merge "Disable verbose NetworkStats logging." 2012-02-28 15:14:19 -08:00
Jeff Sharkey
e7bb71d269 Disable verbose NetworkStats logging. 
Bug: 6076584
Change-Id: I4efcda2b474f623f4fe70db8b43b0aa69017d749
 2012-02-28 15:13:08 -08:00
Dianne Hackborn
00e6fc4c73 am 4953ec1c: am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '4953ec1c71c4c2c134da2c969945c0d8b4fcb03c':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:10:39 -08:00
Dianne Hackborn
4953ec1c71 am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit 'a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:07:43 -08:00
Dianne Hackborn
a2e0e3b5f6 am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:03:28 -08:00
Dianne Hackborn
c221d6ec2f am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:03:18 -08:00
Dianne Hackborn
27e20ccd9a Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 2012-02-28 15:01:05 -08:00
felipeal
d9f94416fc am 635d492d: (-s ours) am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit '635d492d5918fe11a3a9bb9d9a87839a8331d34b':
 2012-02-28 14:59:29 -08:00
felipeal
dcd55a015c am 96236bc8: (-s ours) am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit '96236bc8d93efc0573a18b87699d56a3ed8c0b0b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:59:26 -08:00
Jean-Baptiste Queru
973481d667 am ccd08b8d: am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'ccd08b8de9dc4c9cfaee93cbbcc7053cc9e8d96f':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 14:59:18 -08:00
Dianne Hackborn
5c607433e3 Fix issue #6073913: onActivityResult() not getting called... 
...if the process is killed and restarted

Try to ensure that in all cases we deliver an activity result if one
was requested.

Change-Id: Id43e830d2ee782f98ed1e3b68e5e16f3258d4ad8
 2012-02-28 14:45:23 -08:00
Michael Jurka
a267f0a707 Merge "Add shortcut for voice search" 2012-02-28 14:40:33 -08:00
Michael Jurka
7a3489552c Add shortcut for voice search 
On phones with soft nav bar, make long press on
home launch a voice search intent

Change-Id: I69840a96a08524a76e33a306b799222c879db095
 2012-02-28 14:37:35 -08:00
James Dong
2f16d7eae1 Merge "Fix API issues in DrmRights class." 2012-02-28 14:34:02 -08:00
James Dong
e512ad5089 Merge "Deprecate default constructor for classes that should have been meant to be interfaces" 2012-02-28 14:33:19 -08:00
felipeal
635d492d59 am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit '4bcc910817c694c8d8b20e39a5ff42c584af1d49':
 2012-02-28 14:09:43 -08:00
felipeal
96236bc8d9 am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'fa73815e1d953e67c635877440e717dc84465d97':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:07:26 -08:00
felipeal
4bcc910817 am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:05:23 -08:00
felipeal
fa73815e1d am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:04:20 -08:00
Eric Fischer
6fa13b5a02 Merge "Import translations. DO NOT MERGE" 2012-02-28 13:56:29 -08:00
Eric Fischer
cb4c17d27a Merge "Import translations. DO NOT MERGE" 2012-02-28 13:55:24 -08:00
Jean-Baptiste Queru
ccd08b8de9 am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'e939edb5b4e991998ae8219b03d75c10cdc765cb':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:53:17 -08:00
felipeal
e4ef9b1ac2 DO NOT MERGE 
(from master: Fixed minor typo on Javadoc)

Change-Id: I7d62e37011a7fd4d792fdfe5bd62022a850303a6
 2012-02-28 13:47:15 -08:00
Jean-Baptiste Queru
e939edb5b4 am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'f418738c64413b818e2dc507c912c2678876632f':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:33:44 -08:00
Jean-Baptiste Queru
f418738c64 am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 
* commit 'd7fa7deef9bc0cf22bf450fdb062327697c087c4':
  Fixes update of extras Bundle in new Locations for GPS Provider
 2012-02-28 13:30:39 -08:00
Jeff Sharkey
c81ec3637b Merge "Suppress StrictMode in handleBindApplication()." 2012-02-28 13:21:04 -08:00
James Dong
31db8b9f6b Merge "Remove unnecessary header file includes for drmserver" 2012-02-28 13:09:44 -08:00
James Dong
da5ac93b00 Merge "Added missing javadoc comment for public API in DrmUtils class" 2012-02-28 13:09:24 -08:00
Ying Wang
04a3a4350e Disable ProGuard for FakeOemFeatures to fix build. 
Change-Id: If0ccf16712bf43adb5fe490906be2a13b484f726
 2012-02-28 12:53:19 -08:00
Eric Fischer
18634b34e6 Import translations. DO NOT MERGE 
Change-Id: I2761d2e7bb8795ab23a0024ed41ec299abc400e1
 2012-02-28 12:23:51 -08:00
Eric Fischer
604a7d4e26 Import translations. DO NOT MERGE 
Change-Id: If4aaaf59012a1e6b799e3020a98f6f71117d5895
 2012-02-28 12:13:13 -08:00
Jeff Sharkey
7c5016787e Suppress StrictMode in handleBindApplication(). 
Allow disk access during application and provider setup.  This could
block processing ordered broadcasts, but later processing would
probably end up doing the same disk access.

Bug: 6083825
Change-Id: I80f383063cedba2b099c78465134faa811e898d8
 2012-02-28 12:11:29 -08:00
Jason Noguchi
2437a4ab02 am bb189574: am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'bb189574614d1ce8f9d61e58b7aebbd18f0d6c25':
 2012-02-28 11:57:39 -08:00
Jason Noguchi
eb5698a6b9 am a1de5e48: am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'a1de5e48125797b5a6fcc43b68ddfd3d9d831e87':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:55:13 -08:00
Jason Noguchi
bb18957461 am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'eac4b187d357eac61475c4dc6f673656e08e75a9':
 2012-02-28 11:53:49 -08:00
Jason Noguchi
a1de5e4812 am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit '743aceec4289508a8c514dae7319659cf7f278c4':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:52:56 -08:00
Jason Noguchi
743aceec42 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:50:14 -08:00