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

102132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8ad30d81a0 am 36141361: am 0f316e84: Merge "Remove redundant parameter to modifyRoute" into jb-mr2-dev 
* commit '361413613cf2c2815141423b8094a1366e686c28':
  Remove redundant parameter to modifyRoute
 2013-03-12 00:12:16 +00:00
Lorenzo Colitti
361413613c am 0f316e84: Merge "Remove redundant parameter to modifyRoute" into jb-mr2-dev 
* commit '0f316e8453a0da7dbf131316f0cae79773f22945':
  Remove redundant parameter to modifyRoute
 2013-03-12 00:10:06 +00: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
1b9aa4df6c am bc0003c3: am 58e747fe: am 49c6ff0a: am a9cac9aa: am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745 
* commit 'bc0003c3ad81ad547dfb7519420d34eb9913bb34':
  docs: Fixed import statements for licensing docs. Bug: 8360745
 2013-03-11 23:12:58 +00:00
quddusc
bc0003c3ad am 58e747fe: am 49c6ff0a: am a9cac9aa: am e1c2a62a: am 1267cfc3: am 616908fe: docs: Fixed import statements for licensing docs. Bug: 8360745 
* commit '58e747fe65336280f9973015195eb2f340918d02':
  docs: Fixed import statements for licensing docs. Bug: 8360745
 2013-03-11 23:11:45 +00: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
Jim Miller
ab80d007de am 33c05985: am e70748e7: Merge "Remove unnecessary userid check" into jb-mr2-dev 
* commit '33c05985102ea9a357263bba8e6a3789d20f6ba7':
  Remove unnecessary userid check
 2013-03-11 23:02:47 +00:00
Jim Miller
33c0598510 am e70748e7: Merge "Remove unnecessary userid check" into jb-mr2-dev 
* commit 'e70748e78b0819bf485efdeabe7f8447b201b13a':
  Remove unnecessary userid check
 2013-03-11 23:01:30 +00: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
Elliott Hughes
e4ea9bc0ec 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:52:49 -07:00
Craig Mautner
3a4dc42b86 Add debug for b/8263462. 
Look for race condition in soft input method attach.

For bug 8263462.

Change-Id: Id0609a743d57ab685c036372100ddd33819bff03
 2013-03-11 15:52:19 -07:00
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
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
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
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
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
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
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