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

121426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
40432bdf15 Merge "Restore parameter lost in merge." 2013-12-19 21:07:47 +00:00
Craig Mautner
7426684948 Restore parameter lost in merge. 
Fixes build.

Change-Id: I40489334ca5dc10d0041b78a82535c41e13def11
 2013-12-19 13:02:30 -08:00
Michael Wright
f072be84ae Merge "Add Rhodi kl file" 2013-12-19 20:21:47 +00:00
Craig Mautner
139d2e185a Merge changes Ibbac3f6e,I33c6b4e1 
* changes:
  resolved conflicts for merge of b7bba718 to master
  DO NOT MERGE: Eliminate StackBox.
 2013-12-19 18:57:27 +00:00
Craig Mautner
ff288f7f57 resolved conflicts for merge of b7bba718 to master 
Change-Id: Ibbac3f6e3eda0149ae9446d6baed1d1bee5138ac
 2013-12-19 10:55:17 -08:00
Yorke Lee
710de6dc03 Merge "PhoneNumberUtils API changes" 2013-12-19 18:51:49 +00:00
Craig Mautner
ed6649f89f DO NOT MERGE: Eliminate StackBox. 
StackBox is too constraining. Adding size and position to TaskStacks
directly makes stack positioning and management more flexible and
prepares for ActivityView.

Change-Id: I33c6b4e1c23a5a8069fd507c160bcb34e4d287b2
 2013-12-19 10:51:23 -08:00
Craig Mautner
b7bba718a8 Merge "Pair ActivityStacks with Displays" into klp-modular-dev 2013-12-19 18:29:50 +00:00
Craig Mautner
8a4c62e3fa am b905a37c: am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit 'b905a37c7a18e8ad98497dea5ab7bd016e3c995d':
  Keydispatching timeout while finish Activity
 2013-12-19 18:03:58 +00:00
Craig Mautner
b905a37c7a am 46f618a7: am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit '46f618a7d9dde8e668666e0c582d88ddfea759d9':
  Keydispatching timeout while finish Activity
 2013-12-19 18:00:40 +00:00
Craig Mautner
46f618a7d9 am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit 'a8dfd5d896b71faf87b03d27df6050284765fb21':
  Keydispatching timeout while finish Activity
 2013-12-19 17:58:08 +00:00
Craig Mautner
a8dfd5d896 am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit '4dcf1af3ed8dfa546e6cbf5ecfa66914a3fda883':
  Keydispatching timeout while finish Activity
 2013-12-19 09:55:33 -08:00
Craig Mautner
4dcf1af3ed am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit 'cccf2a333793badbcea9b04fe3f29447496a56d9':
  Keydispatching timeout while finish Activity
 2013-12-19 09:52:32 -08:00
Craig Mautner
cccf2a3337 Merge "Keydispatching timeout while finish Activity" 2013-12-19 17:48:58 +00:00
Narayan Kamath
8907644bb6 am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit 'ad1ff47213e1b3a34a2b9e5a189742e9a15ed486':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 13:14:17 +00:00
Narayan Kamath
ad1ff47213 am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit '7bbc79fd68ea358891ef7e7fa758c009491c4ea0':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 13:10:40 +00:00
Narayan Kamath
7bbc79fd68 am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit '91f6aaaf2cb1c1a0cec129cec8038332de0271a8':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 13:04:19 +00:00
Narayan Kamath
91f6aaaf2c am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit '2d2d594308693af79bf5c44f0dcc30f29d2dc31a':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 05:01:34 -08:00
Narayan Kamath
2d2d594308 am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit 'f3172c623e4bb77a047262c6e7eedc4a2c2ea95a':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 04:37:52 -08:00
Narayan Kamath
f3172c623e Merge "MediaDrm#mNativeContext is a long, not int." 2013-12-19 12:35:24 +00:00
Martin Wallgren
c8733b818d Keydispatching timeout while finish Activity 
If there is input to be handled during finish activity we can get a
keydispatching timeout ANR. The reason is that finish activity is some
times not possible, and the activity is instead put on a finish queue.
The activity will then be finished sometime in the future. When we add
the activity to the finish queue, key dispatching is paused, and there
is an ANR timer waiting for it to be resumed again. Since it can take a
long time before the activity is actually finished, we need to resume
the key dispatching to avoid the ANR.

Change-Id: Icea4ab3b5ad05c8bfbadf8f5cece1a59ec621469
 2013-12-19 13:24:00 +01:00
Brian Carlstrom
69d251383f Track Looper decoupling from ALooper 
Change-Id: I83d1f5f6600019268c53706b7bf6d94b84931e18
 2013-12-19 00:25:07 -08:00
Brian Carlstrom
0c2a8c7f27 am 67fa194e: am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit '67fa194ecb9e1d28ae3c60110bef671a3312b13b':
  Track Looper decoupling from ALooper
 2013-12-19 07:58:25 +00:00
Brian Carlstrom
67fa194ecb am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'ee767548ba2b4d70e7c7bdc6c56dc0c6634e85d3':
  Track Looper decoupling from ALooper
 2013-12-19 07:27:24 +00:00
Brian Carlstrom
ee767548ba am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'd9386812169dd84a7f2bdd3a38a57b9c860525db':
  Track Looper decoupling from ALooper
 2013-12-19 07:25:23 +00:00
Brian Carlstrom
d938681216 am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'f64a30f8a68fbd6ee4f7ae2f66267e23f04c5839':
  Track Looper decoupling from ALooper
 2013-12-18 23:21:50 -08:00
Brian Carlstrom
f64a30f8a6 am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'a11371f42b4dd793a48faa3323be34bca0f6d2e6':
  Track Looper decoupling from ALooper
 2013-12-18 23:16:17 -08:00
Brian Carlstrom
a11371f42b Merge "Track Looper decoupling from ALooper" 2013-12-19 07:13:02 +00:00
Baligh Uddin
0c0c0e4a26 am 48b5f4b1: (-s ours) am 73a2208d: (-s ours) am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '48b5f4b17677c60f6a2ff75bcc50a56182371b07':
  Import translations. DO NOT MERGE
 2013-12-19 05:57:30 +00:00
Baligh Uddin
48b5f4b176 am 73a2208d: (-s ours) am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '73a2208de1f8e319686a8ae77733b88a261881b5':
  Import translations. DO NOT MERGE
 2013-12-19 05:53:19 +00:00
Baligh Uddin
73a2208de1 am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b158819d4b86e920413b5cc57e168357a0fb4203':
  Import translations. DO NOT MERGE
 2013-12-19 05:48:41 +00:00
Baligh Uddin
b158819d4b am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2e371ee14a59ecedeaa02d1b5f7fc518f9203520':
  Import translations. DO NOT MERGE
 2013-12-18 20:55:49 -08:00
Baligh Uddin
2e371ee14a am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c5b19fd397f0c42fa64d79a50edec4e20394241f':
  Import translations. DO NOT MERGE
 2013-12-18 20:52:34 -08:00
Baligh Uddin
c5b19fd397 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-19 04:49:33 +00:00
Michael Wright
88d7a06508 Add Rhodi kl file 
Change-Id: I950fd2df88b6100dce29e97fd1d9b292ed51fffe
 2013-12-18 18:20:43 -08:00
Tim Murray
dc9197eecd am ebef15bd: am bf8859d8: am 9619cddb: am acf7b5d2: am 9dabdaec: Merge "Handle user-defined cache path for RS." 
* commit 'ebef15bde6f4d7495c8472e2b91af29a6756f175':
  Handle user-defined cache path for RS.
 2013-12-19 01:58:58 +00:00
Brian Carlstrom
82b007d757 Track Looper decoupling from ALooper 
Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
 2013-12-18 17:56:35 -08:00
Tim Murray
ebef15bde6 am bf8859d8: am 9619cddb: am acf7b5d2: am 9dabdaec: Merge "Handle user-defined cache path for RS." 
* commit 'bf8859d8b023eaf5d1f3fa186ce9cb85e15e1e81':
  Handle user-defined cache path for RS.
 2013-12-19 01:55:42 +00:00
Tim Murray
bf8859d8b0 am 9619cddb: am acf7b5d2: am 9dabdaec: Merge "Handle user-defined cache path for RS." 
* commit '9619cddb014f090ec4d84eb817157c7bfad94c05':
  Handle user-defined cache path for RS.
 2013-12-19 01:53:32 +00:00
Tim Murray
9619cddb01 am acf7b5d2: am 9dabdaec: Merge "Handle user-defined cache path for RS." 
* commit 'acf7b5d24a98dc97b551e205bf7638f47d9304c0':
  Handle user-defined cache path for RS.
 2013-12-18 17:48:22 -08:00
Tim Murray
acf7b5d24a am 9dabdaec: Merge "Handle user-defined cache path for RS." 
* commit '9dabdaec39836fc800bbdd5ea7b85c3d06889307':
  Handle user-defined cache path for RS.
 2013-12-18 17:45:37 -08:00
Tim Murray
9dabdaec39 Merge "Handle user-defined cache path for RS." 2013-12-19 01:42:41 +00:00
Svetoslav
48df8b8528 Merge "Removed print services not fully cleaned up." 2013-12-19 01:36:36 +00:00
Svetoslav
dbcc95d4d8 Removed print services not fully cleaned up. 
1. When a print services is removed it is removed from the
   installed and enabled services but not from the active
   ones while it should.

2. If a package has more than one print service (very rare
   but possible) we are executing the "make everything right"
   code for each of them which is not very optimal.

Change-Id: I7f6fc4eef10b6757d3b2ede33eb298c3399c3ff7
 2013-12-18 17:35:43 -08:00
Tim Murray
804ff38bff Handle user-defined cache path for RS. 
Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
 2013-12-18 17:04:04 -08:00
Craig Mautner
a909969386 am 525680d2: Merge "Fix loop limits." into klp-modular-dev 
* commit '525680d2bff686ecbddeb84f7f493f8bb31e670d':
  Fix loop limits.
 2013-12-19 00:47:34 +00:00
Stephen Hines
2b3f9aa748 am 16c75d3a: am a341c97b: am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 
* commit '16c75d3a5896006bddcf4b3a39167efc1972540e':
  DO NOT MERGE - Fix improper declaration/use of pointer.
 2013-12-19 00:47:30 +00:00
Craig Mautner
525680d2bf Merge "Fix loop limits." into klp-modular-dev 2013-12-19 00:45:32 +00:00
Stephen Hines
16c75d3a58 am a341c97b: am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 
* commit 'a341c97bf7546243fa312d98de59394442142d38':
  DO NOT MERGE - Fix improper declaration/use of pointer.
 2013-12-19 00:44:27 +00:00
Craig Mautner
704e40b8ba Fix loop limits. 
Fixes bug 12207606.

Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
 2013-12-18 16:43:51 -08:00