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

101630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
a15afd2bc4 resolve a few doc issues from external reports 
Change-Id: Ic4ca327bf2ac92ed259fbd3c51fe5a4453afb479
 2013-03-12 09:25:22 -07:00
Baligh Uddin
7741e623b8 Import translations. DO NOT MERGE 
Change-Id: Ice2858fac7d254735d28f22bc1df95e684deefe8
Auto-generated-cl: translation import
 2013-03-12 09:11:05 -07:00
Daniel Sandler
1d280ee958 Merge "Accumulate updates to notifications before archiving." into jb-mr2-dev 2013-03-12 15:53:45 +00:00
Nils Holmström
df337f30e9 Fix NPE when pasting non-text from Clipboard 
When copying a link from a bookmark and then pasting it into
a textfield a NullPointerException will occur.
A ClipData.Item is not guaranteed to always contain a text string
and therefore getText() can be set to null.

Using method coerceToText() instead of getText() makes sure that
a text string is always returned.

Change-Id: I81343c0371835a3a7a52045dcd1760e69e59a967
 2013-03-12 20:49:14 +09:00
Stephen Hines
9f6421a365 Merge "Update RSTest_v14 for stride changes." into jb-mr2-dev 2013-03-12 03:27:42 +00:00
Romain Guy
2a2ead93a9 Merge "Precache paths from a worker thread" into jb-mr2-dev 2013-03-12 01:43:20 +00:00
Michael Wright
b13eb3e789 Merge changes I674b9804,If2d2e37b into jb-mr2-dev 
* changes:
  Add touch navigation input source
  Add InputDevice#isFromSource convenience method
 2013-03-12 01:03:23 +00:00
Michael Wright
e7a9ae8ba0 Add touch navigation input source 
Bug: 8276741
Change-Id: I674b9804bf9ae76d694ae7073b54a7d43474a43c
 2013-03-11 17:58:22 -07:00
Lorenzo Colitti
0f316e8453 Merge "Remove redundant parameter to modifyRoute" into jb-mr2-dev 2013-03-12 00:06:41 +00:00
Romain Guy
ca89e2a687 Precache paths from a worker thread 
Change-Id: I3e7b53d67e0e03e403beaf55c39350ead7f1e309
 2013-03-11 17:05:28 -07:00
quddusc
58e747fe65 am 49c6ff0a: am a9cac9aa: am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745 
* commit '49c6ff0a037065563e2a3e1c9146c5b86eb1d3f0':
  docs: Fixed import statements for licensing docs. Bug: 8360745
 2013-03-11 16:10:28 -07:00
quddusc
49c6ff0a03 am a9cac9aa: am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745 
* commit 'a9cac9aa4322a2969c9614aa01f63c13e5f0189e':
  docs: Fixed import statements for licensing docs. Bug: 8360745
 2013-03-11 16:07:56 -07:00
quddusc
a9cac9aa43 am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745 
* commit 'e1c2a62a75fa0e4c899e66220b2b20f4b41ac19c':
  docs: Fixed import statements for licensing docs. Bug: 8360745
 2013-03-11 16:05:18 -07:00
quddusc
e1c2a62a75 am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745 
* commit '1267cfc38dcabfe9cdfa7388c7b0b306926e06cc':
  docs: Fixed import statements for licensing docs. Bug: 8360745
 2013-03-11 16:03:03 -07:00
Michael Wright
74e4156e5c Add InputDevice#isFromSource convenience method 
Change-Id: If2d2e37bc3fff5a862ea3652c7ef9778018e7ecc
 2013-03-11 16:02:51 -07:00
quddusc
1267cfc38d am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745 
* commit '616908fee48c44a2115d5d63583ccf04e401b3da':
  docs: Fixed import statements for licensing docs. Bug: 8360745
 2013-03-11 16:01:28 -07:00
Jim Miller
e70748e78b Merge "Remove unnecessary userid check" into jb-mr2-dev 2013-03-11 22:58:33 +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
Lorenzo Colitti
2adea7ff3b Remove redundant parameter to modifyRoute 
modifyRoute takes both an interface name and a LinkProperties.
This is redundant because all callers get the interface name
from the LinkProperties. Make modifyRoute get the interface
name from the LinkProperties instead.

Change-Id: I41ba8e0a10241c2f1107204fcaca2be74556042b
 2013-03-12 07:39:59 +09: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
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
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
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
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
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
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
de96589113 Merge "Always specify an interface for host routes." into jb-mr2-dev 2013-03-11 17:22:25 +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
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
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
Michael Jurka
bb2b6b3bb7 Merge "Updating search asset for action bar" into jb-mr2-dev 2013-03-11 11:04:44 +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