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

101992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
bb709246f3 am 94a731fa: am 5ef14b25: Merge "audio service: fix BT SCO intent permission" into jb-mr2-dev 
* commit '94a731fabf6830ef3068e78ab0ac435f67daa6a8':
  audio service: fix BT SCO intent permission
 2013-03-11 22:46:45 +00:00
Eric Laurent
94a731fabf am 5ef14b25: Merge "audio service: fix BT SCO intent permission" into jb-mr2-dev 
* commit '5ef14b259fa07f08b29fa7888d39128456dc253a':
  audio service: fix BT SCO intent permission
 2013-03-11 22:44:26 +00:00
Eric Laurent
5ef14b259f Merge "audio service: fix BT SCO intent permission" into jb-mr2-dev 2013-03-11 22:40:48 +00:00
Elliott Hughes
0d193dbabf am a1900187: am 7b517a5c: am a45bafc2: am c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time." 
* commit 'a1900187868c094341062024578bbfaed3c1b238':
  Fix DateFormat k and h, and implement K and H for the first time.
 2013-03-11 22:39:55 +00:00
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
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
ec509edfa6 am 8313ba36: am 8c63487f: Merge "Java API for MediaMuxer" into jb-mr2-dev 
* commit '8313ba36b0186dd93c481cd85418d3e78b33e6ed':
  Java API for MediaMuxer
 2013-03-11 21:52:42 +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
a0f5813a30 am d3cc3bbc: am a31d507e: am 7c1e8dbd: am 21d3f294: Merge "use Calendar in DateUtils format method" 
* commit 'd3cc3bbcdce86f809d4b511e74c46ae3beeafc20':
  use Calendar in DateUtils format method
 2013-03-11 21:28:57 +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
Jeff Sharkey
345fc4cc92 am 1b48ecf8: am f2afddb5: Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev 
* commit '1b48ecf89a13a104820d5ccf52ba7f5dd622d3a6':
  Handle corrupt RegisteredServicesCache XML.
 2013-03-11 20:31:51 +00: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
07e455011f am 5343658d: am 36818c41: Merge "Unbreak documentation build." into jb-mr2-dev 
* commit '5343658d5c77723026a12bc5dde96bab787d469b':
  Unbreak documentation build.
 2013-03-11 19:51:50 +00:00
Craig Mautner
d8b070ccc1 Merge "Add ActivityStack to PendingActivityLaunch" 2013-03-11 19:42:06 +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
Craig Mautner
8463bc7709 Merge "Add debug for b/8263462." 2013-03-11 19:40:11 +00:00
Craig Mautner
68811a4521 Add debug for b/8263462. 
Look for race condition in soft input method attach.

For bug 8263462.

Change-Id: Id0609a743d57ab685c036372100ddd33819bff03
 2013-03-11 12:39:20 -07: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
Craig Mautner
64f2b1738a Add ActivityStack to PendingActivityLaunch 
The task used by doPendingActivityLaunches is not known at the
time that the PendingActivityLaunch is created. Leading to an NPE.
Adding the ActivityStack to the PAL fixes this.

Fixes bug 8351149.

Change-Id: I64539b8f2e608128ef9d795c0739ef1de7a246d0
 2013-03-11 11:40:31 -07:00
Elliott Hughes
ed49118bb8 am 88f0ed7a: am a509b6b1: am 31bb1dec: am 5b543775: Merge "update preloaded-classes" 
* commit '88f0ed7ab97a7474004d0073d72f1875eedb336e':
  update preloaded-classes
 2013-03-11 18:35:48 +00: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
Irfan Sheriff
b716c82dbd am 90d1ff0e: am 1f9806a4: Merge "Fix reconnect/reassociate handling" into jb-mr2-dev 
* commit '90d1ff0eab3b038544d940b1249217d9f29236e8':
  Fix reconnect/reassociate handling
 2013-03-11 18:24:26 +00: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
5aae35d8e4 am 13d1c27e: am de965891: Merge "Always specify an interface for host routes." into jb-mr2-dev 
* commit '13d1c27eda1465eeb09823eb9e82fccf67dfb15e':
  Always specify an interface for host routes.
 2013-03-11 17:27:11 +00: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
c4de19e250 am 6d8086aa: am 1dc2ff66: Merge "RouteInfo changes." into jb-mr2-dev 
* commit '6d8086aa0d00397fec8afc8649399cdfcbc378c3':
  RouteInfo changes.
 2013-03-11 17:23:43 +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
d00879058c am 1fb80006: am 614edf58: Merge "Add additional message methods." into jb-mr2-dev 
* commit '1fb800061726e1b53a2e185e377316b6e87c93ad':
  Add additional message methods.
 2013-03-11 16:50:03 +00: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
Selim Gurun
0d8ab21576 am f2fb1730: am 2bf500ed: Merge "Add a delimiter between scheme and host" into jb-mr2-dev 
* commit 'f2fb17308efc89664cabdbcae4ef89f9033c7dbe':
  Add a delimiter between scheme and host
 2013-03-11 16:33:23 +00:00