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

101915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
a190018786 am 7b517a5c: am a45bafc2: am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time." 
* commit '7b517a5c796f4c1120533c62686f7912ebfb2ef8':
  Fix DateFormat k and h, and implement K and H for the first time.
 2013-03-11 22:37:35 +00:00
quddusc
616908fee4 docs: Fixed import statements for licensing docs. 
Bug: 8360745

Change-Id: Ic72adc7c571c8a36d784afd997418307fb7b2a9f
 2013-03-11 15:36:03 -07:00
Elliott Hughes
7b517a5c79 am a45bafc2: am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time." 
* commit 'a45bafc2f025d2ef513f3e3dcac162ba6a95d575':
  Fix DateFormat k and h, and implement K and H for the first time.
 2013-03-11 15:35:36 -07:00
Elliott Hughes
a45bafc2f0 am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time." 
* commit 'c9e0cd2ac7b1df3e60f0ca8bab6a7240bade07d9':
  Fix DateFormat k and h, and implement K and H for the first time.
 2013-03-11 15:27:52 -07:00
Elliott Hughes
c9e0cd2ac7 Merge "Fix DateFormat k and h, and implement K and H for the first time." 2013-03-11 22:03:18 +00:00
ztenghui
8313ba36b0 am 8c63487f: Merge "Java API for MediaMuxer" into jb-mr2-dev 
* commit '8c63487f3eea9b7276e0559af13f9b35f587cbe5':
  Java API for MediaMuxer
 2013-03-11 21:50:48 +00:00
Elliott Hughes
7a89f62877 Fix DateFormat k and h, and implement K and H for the first time. 
Bug: 8359981
Change-Id: I52ef937a77e9e28f2719c2ee6f59e4b74514f0b2
 2013-03-11 14:49:44 -07:00
ztenghui
8c63487f3e Merge "Java API for MediaMuxer" into jb-mr2-dev 2013-03-11 21:45:20 +00:00
Elliott Hughes
d3cc3bbcdc am a31d507e: am 7c1e8dbd: am 21d3f294: Merge "use Calendar in DateUtils format method" 
* commit 'a31d507e3fbd8cfa85861714beeb977b4e573b18':
  use Calendar in DateUtils format method
 2013-03-11 21:24:39 +00:00
Elliott Hughes
a31d507e3f am 7c1e8dbd: am 21d3f294: Merge "use Calendar in DateUtils format method" 
* commit '7c1e8dbd3159c88df27d24aa2699358ee139d49b':
  use Calendar in DateUtils format method
 2013-03-11 14:21:17 -07:00
Elliott Hughes
7c1e8dbd31 am 21d3f294: Merge "use Calendar in DateUtils format method" 
* commit '21d3f294831f7a15c5e746b3dae3e6ec0de883a8':
  use Calendar in DateUtils format method
 2013-03-11 14:19:14 -07:00
Jim Miller
f083324b42 Remove unnecessary userid check 
This removes code used to verify the userid's were consistent, which
is no longer needed.

Fixes bug 8167800

Change-Id: I592e4bc1158fb7775bd31ae8a26c1782b60f0fa0
 2013-03-11 13:57:12 -07:00
Jeff Sharkey
1b48ecf89a am f2afddb5: Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev 
* commit 'f2afddb57dfbcbe35ccbeb4d66bfff99eb3e4c65':
  Handle corrupt RegisteredServicesCache XML.
 2013-03-11 20:29:31 +00:00
Jeff Sharkey
f2afddb57d Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev 2013-03-11 20:25:48 +00:00
Jeff Sharkey
293ad6c674 Handle corrupt RegisteredServicesCache XML. 
Avoid getting stuck in infinite loop.

Bug: 8360183
Change-Id: I81728dcfbc35b456c9166cf5c5175d0a376df56f
 2013-03-11 13:22:29 -07:00
Elliott Hughes
21d3f29483 Merge "use Calendar in DateUtils format method" 2013-03-11 20:11:20 +00:00
Lorenzo Colitti
5343658d5c am 36818c41: Merge "Unbreak documentation build." into jb-mr2-dev 
* commit '36818c414d5ccd23ea7bb68993b007aee50a8cc6':
  Unbreak documentation build.
 2013-03-11 19:41:33 +00:00
Lorenzo Colitti
36818c414d Merge "Unbreak documentation build." into jb-mr2-dev 2013-03-11 19:33:31 +00:00
ztenghui
68ccf103a1 Java API for MediaMuxer 
Implement the Java API for MediaMuxer.

bug:7991013

Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636
 2013-03-11 12:30:56 -07:00
Lorenzo Colitti
574b00a362 Unbreak documentation build. 
Change-Id: I1e904b111e23d221dcb5f917201d4c27f0c1c05b
 2013-03-12 04:30:47 +09:00
Elliott Hughes
88f0ed7ab9 am a509b6b1: am 31bb1dec: am 5b543775: Merge "update preloaded-classes" 
* commit 'a509b6b1396d414b424ddfbea292b23bba46a4aa':
  update preloaded-classes
 2013-03-11 18:33:56 +00:00
Elliott Hughes
a509b6b139 am 31bb1dec: am 5b543775: Merge "update preloaded-classes" 
* commit '31bb1dec27c1f8e5c96e52d0a7655a231412376f':
  update preloaded-classes
 2013-03-11 11:29:26 -07:00
Sungmin Choi
9a2ada418b use Calendar in DateUtils format method 
The DatePickerDialog is using DateUtils to format the dialog's title
and the DateUtils class does not work with dates outside to the
specified range.
For example, if user selects 2038-03-07, DatePickerDialog shows
1902-01-30 on Title.
The reason for the DateUtils class not being able to format dates
outside the range of 1902 and 2036 is because internally it is using
the Time class which does not support such dates.
To fix it, use Calendar class in DataUilts format method.

Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1902 or after 2037
5. update wrong date on Title

Bug: https://code.google.com/p/android/issues/detail?id=13050
Change-Id: I003266765751b5c340426af84daef271f39f771e
 2013-03-11 11:24:02 -07:00
Irfan Sheriff
90d1ff0eab am 1f9806a4: Merge "Fix reconnect/reassociate handling" into jb-mr2-dev 
* commit '1f9806a41d5aa6f94499ec25769eb16af4a6cf9f':
  Fix reconnect/reassociate handling
 2013-03-11 18:22:35 +00:00
Irfan Sheriff
1f9806a41d Merge "Fix reconnect/reassociate handling" into jb-mr2-dev 2013-03-11 18:19:33 +00:00
Elliott Hughes
31bb1dec27 am 5b543775: Merge "update preloaded-classes" 
* commit '5b5437752fb2318142a41b6320b00a000575503f':
  update preloaded-classes
 2013-03-11 10:32:08 -07:00
Lorenzo Colitti
13d1c27eda am de965891: Merge "Always specify an interface for host routes." into jb-mr2-dev 
* commit 'de965891130bc50bd02eb6f7bac2ea177a733c2c':
  Always specify an interface for host routes.
 2013-03-11 17:25:01 +00:00
Lorenzo Colitti
de96589113 Merge "Always specify an interface for host routes." into jb-mr2-dev 2013-03-11 17:22:25 +00:00
Lorenzo Colitti
6d8086aa0d am 1dc2ff66: Merge "RouteInfo changes." into jb-mr2-dev 
* commit '1dc2ff66af106d1e951a5678586215ce0e27e8f6':
  RouteInfo changes.
 2013-03-11 17:21:31 +00:00
Lorenzo Colitti
1dc2ff66af Merge "RouteInfo changes." into jb-mr2-dev 2013-03-11 17:19:00 +00:00
Elliott Hughes
5b5437752f Merge "update preloaded-classes" 2013-03-11 16:59:49 +00:00
Sungmin Choi
42bb0307f8 update preloaded-classes 
Remove some preloaded-classes and fix typo for deleting log messages
as the followings during booting.

W/Zygote  (  163): Class not found for preloading: android.bluetooth.
BluetoothAudioGateway
W/Zygote  (  163): Class not found for preloading: android.bluetooth.
HeadsetBase
W/Zygote  (  163): Class not found for preloading: undroid.content.Ab
stractThreadedSyncAdapter$SyncThread

Change-Id: Id02e0cccaeb150f48e12d67b2d691df828842e4c
 2013-03-11 09:59:13 -07:00
Wink Saville
1fb8000617 am 614edf58: Merge "Add additional message methods." into jb-mr2-dev 
* commit '614edf5833826da373cd88476e73147afbc0dc95':
  Add additional message methods.
 2013-03-11 16:48:16 +00:00
Wink Saville
614edf5833 Merge "Add additional message methods." into jb-mr2-dev 2013-03-11 16:46:05 +00:00
Wink Saville
4753cd2014 Add additional message methods. 
Change-Id: Iac96815f7b72bcb3b9c658a24c24e0733e0ea1b0
 2013-03-11 09:32:48 -07:00
Selim Gurun
f2fb17308e am 2bf500ed: Merge "Add a delimiter between scheme and host" into jb-mr2-dev 
* commit '2bf500ed211a8fba37df80dff6aba387fb832284':
  Add a delimiter between scheme and host
 2013-03-11 16:31:36 +00:00
Selim Gurun
2bf500ed21 Merge "Add a delimiter between scheme and host" into jb-mr2-dev 2013-03-11 16:25:38 +00:00
Irfan Sheriff
accec86ce4 Fix reconnect/reassociate handling 
We are dropping incorrectly when in disconnected state

Bug: 8357624
Change-Id: I8919dcd679da6b5fc6c7f671e243f08e42b91ff3
 2013-03-11 08:47:39 -07:00
The Android Automerger
efef09e134 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-11 05:56:02 -07:00
Michael Jurka
4bfa6de8ed am bb2b6b3b: Merge "Updating search asset for action bar" into jb-mr2-dev 
* commit 'bb2b6b3bb70aaf9abf70fecaa2ba34b3c3f71142':
  Updating search asset for action bar
 2013-03-11 11:07:33 +00:00
Michael Jurka
bb2b6b3bb7 Merge "Updating search asset for action bar" into jb-mr2-dev 2013-03-11 11:04:44 +00:00
Jason Sams
e06b7696cc am b5afb837: Merge "Handle onPause in ImageProcessing." into jb-mr2-dev 
* commit 'b5afb837147a2d8b330581967c8fac28b0e248e8':
  Handle onPause in ImageProcessing.
 2013-03-09 01:12:09 +00:00
Jason Sams
b5afb83714 Merge "Handle onPause in ImageProcessing." into jb-mr2-dev 2013-03-09 01:09:12 +00:00
Lorenzo Colitti
e167135976 Always specify an interface for host routes. 
Change-Id: I05b4d87e7d7e8237c6f4a70f1fedae00f416f581
 2013-03-08 16:41:25 -08:00
Lorenzo Colitti
45b9a5bb93 RouteInfo changes. 
- Add the interface name.
- Fix a bug where a default route would match an address of
  another protocol (e.g., 0.0.0.0/0 would match 2001::).
- Tweak the hashCode method.
- Write a unit test.

Change-Id: Ida8266de440a9b1d9eaa132f182b9f1ce8978c44
 2013-03-08 16:41:25 -08:00
Jason Sams
990a08fcb4 Handle onPause in ImageProcessing. 
Change-Id: I538ce0ac7b9da2f4ec6cd7bd35aa84fd710e063f
 2013-03-08 16:35:29 -08:00
Elliott Hughes
b9230f3c31 am d6875e33: am 2cb314eb: am e0cd3c19: Merge "Improve DateFormat.format." 
* commit 'd6875e3334899be84b98d0fd32efff1f1b5775da':
  Improve DateFormat.format.
 2013-03-09 00:22:18 +00:00
Elliott Hughes
d6875e3334 am 2cb314eb: am e0cd3c19: Merge "Improve DateFormat.format." 
* commit '2cb314ebc7bb6495a94f577dfb57f9e6c56033ef':
  Improve DateFormat.format.
 2013-03-08 16:21:21 -08:00
Elliott Hughes
2cb314ebc7 am e0cd3c19: Merge "Improve DateFormat.format." 
* commit 'e0cd3c19546a00db3db706c6a993fb0e3bd00b3a':
  Improve DateFormat.format.
 2013-03-08 16:18:42 -08:00
Jim Miller
8fdc7be406 am 6e5d6492: Merge "Fix long-standing bug with LockPatternView drawing artifacts" into jb-mr2-dev 
* commit '6e5d6492db4f0bed604e67ee53b0c99e0685c55f':
  Fix long-standing bug with LockPatternView drawing artifacts
 2013-03-09 00:12:59 +00:00