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

84768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
aae4943297 am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future" 
* commit '4763989d95342c25e9b857dc9ee21eb5ebac31d6':
  Fixes relative time formatting issue for dates in future
 2012-08-27 12:33:57 -07:00
Andy Stadler
de6322c6fb am 0cced983: am be7ddb9f: Merge "Fix package verifier lookup" into jb-mr1-dev 
* commit '0cced983aa7969a431bc66a339626835bdc004e2':
  Fix package verifier lookup
 2012-08-27 12:32:35 -07:00
Dianne Hackborn
4763989d95 am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future" 
* commit '32d1fec50baaecdea34ae2a47ca808e8e4181ed2':
  Fixes relative time formatting issue for dates in future
 2012-08-27 12:31:49 -07:00
Andy Stadler
0cced983aa am be7ddb9f: Merge "Fix package verifier lookup" into jb-mr1-dev 
* commit 'be7ddb9f293076e0c14dc72ea498aced8742b5a9':
  Fix package verifier lookup
 2012-08-27 12:30:40 -07:00
Amith Yamasani
2726d785e5 am 4bcdb70f: am a84a4af9: Merge "Fix adb install" into jb-mr1-dev 
* commit '4bcdb70f75f70b908581a799305272d925f71a7c':
  Fix adb install
 2012-08-27 12:28:46 -07:00
Andy Stadler
be7ddb9f29 Merge "Fix package verifier lookup" into jb-mr1-dev 2012-08-27 12:28:05 -07:00
Amith Yamasani
4bcdb70f75 am a84a4af9: Merge "Fix adb install" into jb-mr1-dev 
* commit 'a84a4af9b11946fe16689cd42741a92ca285ffe9':
  Fix adb install
 2012-08-27 12:26:49 -07:00
Amith Yamasani
a84a4af9b1 Merge "Fix adb install" into jb-mr1-dev 2012-08-27 12:24:24 -07:00
Amith Yamasani
2b91465233 Fix adb install 
Was not properly handling creating DefContainerService when the installation was
for USER_ALL. Not a problem for Market installs.

Bug: 7061571
Change-Id: I4528b4c56e38effa137da56460e78c55b242ba45
 2012-08-27 12:04:40 -07:00
Irfan Sheriff
e48363c965 am 0a51bcd7: am 63dc027b: Merge "Fix permission issue on channel" into jb-mr1-dev 
* commit '0a51bcd7abb250c86318dc5ed35398e229ebe567':
  Fix permission issue on channel
 2012-08-27 12:03:58 -07:00
Irfan Sheriff
0a51bcd7ab am 63dc027b: Merge "Fix permission issue on channel" into jb-mr1-dev 
* commit '63dc027be28762232335797a30449995c555ae10':
  Fix permission issue on channel
 2012-08-27 12:02:03 -07:00
Irfan Sheriff
63dc027be2 Merge "Fix permission issue on channel" into jb-mr1-dev 2012-08-27 11:59:16 -07:00
Jeff Sharkey
8e9e316339 am 1d1efc68: am 62e2709c: Merge "Ensure /data/media before trying to upgrade." into jb-mr1-dev 
* commit '1d1efc6866f3a0c87a13db849b6fe5e268875b07':
  Ensure /data/media before trying to upgrade.
 2012-08-27 11:47:44 -07:00
Jeff Sharkey
1d1efc6866 am 62e2709c: Merge "Ensure /data/media before trying to upgrade." into jb-mr1-dev 
* commit '62e2709c3ff91760108c31e6f60fcf57c8c8da46':
  Ensure /data/media before trying to upgrade.
 2012-08-27 11:44:52 -07:00
Jeff Sharkey
62e2709c3f Merge "Ensure /data/media before trying to upgrade." into jb-mr1-dev 2012-08-27 11:42:30 -07:00
Jeff Sharkey
dc9b0128c5 Ensure /data/media before trying to upgrade. 
Most devices create the path in their init.rc, but create it just
to be sure.  This fixes emulator boot failure.

Bug: 7058844
Change-Id: Icab3ce11c4304d972d13e1d9a0c269cfe05b9370
 2012-08-27 11:41:55 -07:00
Craig Mautner
13972337bf am ca9eeeff: am 9d9ea05c: Merge "Fix drag bug." into jb-mr1-dev 
* commit 'ca9eeeff6a1df45b17270c3f920a8751dde2ccaa':
  Fix drag bug.
 2012-08-27 11:39:25 -07:00
Dianne Hackborn
32d1fec50b Merge "Fixes relative time formatting issue for dates in future" 2012-08-27 11:39:10 -07:00
Dianne Hackborn
697c1cd407 am f7bd090b: am 7e0e19d4: Restore man page entries. 
* commit 'f7bd090bf499273c280531ae3bdeb7f263f77a3e':
  Restore man page entries.
 2012-08-27 11:36:45 -07:00
Craig Mautner
ca9eeeff6a am 9d9ea05c: Merge "Fix drag bug." into jb-mr1-dev 
* commit '9d9ea05cde56f6663f57925212c87860d1cbc1b2':
  Fix drag bug.
 2012-08-27 11:36:37 -07:00
Dianne Hackborn
f7bd090bf4 am 7e0e19d4: Restore man page entries. 
* commit '7e0e19d4201374d72b7082492bd269dbdb17d972':
  Restore man page entries.
 2012-08-27 11:34:58 -07:00
Craig Mautner
9d9ea05cde Merge "Fix drag bug." into jb-mr1-dev 2012-08-27 11:34:50 -07:00
Craig Mautner
3486b9696d Fix drag bug. 
Previous assumption -- that the drag window was defined at time of
DragState construction -- was false. The window, and hence the
Display, is not known until performDrag. This change delays assigning
DragState.mDisplayContent until the window/Display is known.

Fixes bug 7028203.

Change-Id: I5799005652c484ff0c45ab340ce3b9e4b784883e
 2012-08-27 11:31:24 -07:00
Jean-Baptiste Queru
3221b33322 am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe" 
* commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a':
  Make setCaptureRate locale safe
 2012-08-27 11:29:29 -07:00
Jean-Baptiste Queru
26ad1e7874 am 03d16e12: Merge "Make setCaptureRate locale safe" 
* commit '03d16e122aa01f9283836d1e5144428082b4c1cd':
  Make setCaptureRate locale safe
 2012-08-27 11:28:00 -07:00
Dianne Hackborn
7e0e19d420 Restore man page entries. 
Change-Id: I002808037ec117c039aeb71f425c1f43d4cac6d8
 2012-08-27 10:57:30 -07:00
Jean-Baptiste Queru
03d16e122a Merge "Make setCaptureRate locale safe" 2012-08-27 10:22:29 -07:00
James Dong
09433caa6d am abe12af2: am 71d7c3c6: Merge "Added some common error codes in MediaPlayer.java" into jb-mr1-dev 
* commit 'abe12af2d957b5b4510f9a523088d9544771ede4':
  Added some common error codes in MediaPlayer.java
 2012-08-27 10:11:53 -07:00
James Dong
abe12af2d9 am 71d7c3c6: Merge "Added some common error codes in MediaPlayer.java" into jb-mr1-dev 
* commit '71d7c3c628fbce04b8bdb60f127588ada00bae13':
  Added some common error codes in MediaPlayer.java
 2012-08-27 10:09:43 -07:00
James Dong
71d7c3c628 Merge "Added some common error codes in MediaPlayer.java" into jb-mr1-dev 2012-08-27 10:07:14 -07:00
Jean-Baptiste Queru
c07bd57d04 am ab9dfc57: am af188654: am ba37d595: am e70a32af: am eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern" 
* commit 'ab9dfc573a2d6a878ee8423a9154dd388f3adb94':
  VibratorService: Fix to ensure actual delay in a vibrate pattern
 2012-08-27 08:20:45 -07:00
Jean-Baptiste Queru
ab9dfc573a am af188654: am ba37d595: am e70a32af: am eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern" 
* commit 'af18865486df1e23e2951983fb0d1d4bf17f4f32':
  VibratorService: Fix to ensure actual delay in a vibrate pattern
 2012-08-27 08:18:23 -07:00
Jean-Baptiste Queru
af18865486 am ba37d595: am e70a32af: am eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern" 
* commit 'ba37d595f70d348987a9e60c56c071fdd319260f':
  VibratorService: Fix to ensure actual delay in a vibrate pattern
 2012-08-27 08:16:02 -07:00
John Spurlock
7e3fdeac54 am a50940a0: am 68cff8c1: Merge "Beans in space." into jb-mr1-dev 
* commit 'a50940a0e88b9e9a809201df38411fa629501b6b':
  Beans in space.
 2012-08-27 08:13:49 -07:00
Jean-Baptiste Queru
ba37d595f7 am e70a32af: am eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern" 
* commit 'e70a32afc5b27ddc9681efd867780a0c4c77edd3':
  VibratorService: Fix to ensure actual delay in a vibrate pattern
 2012-08-27 08:13:27 -07:00
John Spurlock
a50940a0e8 am 68cff8c1: Merge "Beans in space." into jb-mr1-dev 
* commit '68cff8c117b18136de8f652782b364fc48f25a84':
  Beans in space.
 2012-08-27 08:11:34 -07:00
Jean-Baptiste Queru
e70a32afc5 am eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern" 
* commit 'eb00f951439cd724863d267e8e8d77414383d93f':
  VibratorService: Fix to ensure actual delay in a vibrate pattern
 2012-08-27 08:11:19 -07:00
John Spurlock
68cff8c117 Merge "Beans in space." into jb-mr1-dev 2012-08-27 08:08:11 -07:00
Jean-Baptiste Queru
eb00f95143 Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern" 2012-08-27 07:55:41 -07:00
Yoshihiko Ikenaga
0879d03f0a Added a persistent feature in WiFi Direct. 
Provide a new feature to use persistent group at default.
In the normal connect sequence, if the persistent profile has been
stored, try to use it. Otherwise, a new persistent group is created.
If the persistent profiles are stored over 32, an old profile is
deleted automatically.

Change-Id: Iccb9fa044f1907f0818cd259275e1675f4c3e222
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
 2012-08-27 21:54:44 +09:00
Johan Redestig
1c7928e8c6 Make setCaptureRate locale safe 
Dont use the default String.format in setCaptureRate as it is both
locale unsafe and less efficient than regular string concatenation
in this case.

Change-Id: I29418ec0352ef8c79967592b6eb8ff66cc9c99f0
 2012-08-27 14:24:10 +02:00
Steve Pomeroy
ca3363775e Fixes relative time formatting issue for dates in future 
All variations of getRelativeTimeSpanString() now properly handle dates
that are in the future. Prior, the version used by
getRelativeDateTimeString() would occasionally show the time instead of
a date when the future date was the same weekday as the current weekday.
This resulted in the time output being duplicated, eg.: "11:23, 11:23"

Change-Id: If20972a6942cce792fa233437f94dedfb71379f3
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
 2012-08-27 02:20:13 -04:00
Baligh Uddin
f30279d69f am 4b89d6ca: (-s ours) am aea57c8b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '4b89d6cabb53d72c6d24dd2c13cccb37b427dbad':
  Import translations. DO NOT MERGE
 2012-08-26 17:02:03 -07:00
Baligh Uddin
4b89d6cabb am aea57c8b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'aea57c8b4834801a64d129c031049660b3c4bb6c':
  Import translations. DO NOT MERGE
 2012-08-26 16:59:15 -07:00
Baligh Uddin
aea57c8b48 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-26 16:55:22 -07:00
Baligh Uddin
3f5dcb0324 Merge "Import translations. DO NOT MERGE" 2012-08-26 16:53:51 -07:00
Baligh Uddin
8f5a0974f1 am e6fa3e87: (-s ours) am 4dd27632: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'e6fa3e8744a33f3a40f1c76edca2026b2d67e288':
  Import translations. DO NOT MERGE
 2012-08-26 16:51:02 -07:00
Baligh Uddin
e6fa3e8744 am 4dd27632: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '4dd2763295b04d41413331a7ed77564f1bbdfdf7':
  Import translations. DO NOT MERGE
 2012-08-26 16:49:35 -07:00
Baligh Uddin
4dd2763295 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-26 16:46:23 -07:00
Baligh Uddin
8f9121bd64 Merge "Import translations. DO NOT MERGE" 2012-08-26 16:44:40 -07:00