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

160921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
5055589269 am edc19979: am 82ef988c: am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'edc199796844db9ee947165ddfff7cec810403e2':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 17:09:47 +00:00
Chris Wren
8bac9b5a6e am ca20e6c6: am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit 'ca20e6c637c34a1200f08b2de5485193bc4eb74c':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 17:09:43 +00:00
Paul Jensen
60c8c86df3 am 8c4ba7c3: am 18434fcc: am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '8c4ba7c3f6263a692c9b2ac1164348ad853206e8':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 17:09:38 +00:00
Alexandra Gherghina
58499d61f8 am 8292b033: am a266670a: am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit '8292b0331e21af8786791067e92009e949448f3f':
  Adds the ability to start a user in background
 2014-10-01 17:09:34 +00:00
Dianne Hackborn
63f38a0836 am e83f322f: am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit 'e83f322fa91f64844ea24aab2944540ca43a2a01':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 17:09:29 +00:00
Winson Chung
be1b7ddb44 am ac5bb347: am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'ac5bb347cb769f217135124ddb6008bab9727d22':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:09:22 +00:00
John Spurlock
f35be105ee am 9a4fc6aa: am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '9a4fc6aab9884af87d49e0d912da56dd8bfe8868':
  Don't play hint animations when dozing
 2014-10-01 17:09:18 +00:00
Jason Monk
e9250ae94f am 81ab90f2: am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '81ab90f2173c8afac82a22c2cca72eb90293de9a':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:09:13 +00:00
George Mount
c416fb8c62 am 8cc88125: am 6d7a0cd5: am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '8cc881257c6e8e9448a05e25688861536ea55971':
  Clear preordered list after use.
 2014-10-01 17:09:09 +00:00
John Spurlock
c4b4ffb808 am abc4db31: am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'abc4db312aa6e5287b5abbd2d201f10d642fca7d':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 17:09:05 +00:00
Baligh Uddin
66e622ba6a am f13bb6f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'f13bb6f53ca5a86ba7822dd1735adb417bfaf34e':
  Import translations. DO NOT MERGE
 2014-10-01 17:04:00 +00:00
Chris Wren
edc1997968 am 82ef988c: am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit '82ef988c92fb158125f294201baecaceff7bcc8e':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 17:00:32 +00:00
Chris Wren
ca20e6c637 am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit '1d88c087e6f95d1e29a2d657b4a446f2a20d75c4':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 17:00:28 +00:00
Paul Jensen
8c4ba7c3f6 am 18434fcc: am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '18434fcc99e15f4cb29e4b07d4b1d7ba14b8285f':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 17:00:24 +00:00
Alexandra Gherghina
8292b0331e am a266670a: am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit 'a266670adf26984a25aaafc79ddd521dfcf6180c':
  Adds the ability to start a user in background
 2014-10-01 17:00:21 +00:00
Dianne Hackborn
e83f322fa9 am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit '30854356ef263a4e4ac3bd2376886f272d768e72':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 17:00:18 +00:00
Winson Chung
ac5bb347cb am 3175f7d2: am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '3175f7d245daba660852cbcb92a7a821899b70a3':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 17:00:14 +00:00
John Spurlock
9a4fc6aab9 am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'eac6926f0cb260339ec7ec2495964331249338e2':
  Don't play hint animations when dozing
 2014-10-01 17:00:10 +00:00
Jason Monk
81ab90f217 am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '9e280c447f5f8747f7c4777d80d5dd7c25e7713e':
  Pull roaming from mServiceState for consistency
 2014-10-01 17:00:05 +00:00
George Mount
8cc881257c am 6d7a0cd5: am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '6d7a0cd57f75e3b88a7f8a0f74694c8c049784c3':
  Clear preordered list after use.
 2014-10-01 16:59:48 +00:00
John Spurlock
abc4db312a am 3fd4440f: am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit '3fd4440fea2d29f423a99cfaa5e30f4ff5c2239d':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 16:59:44 +00:00
Baligh Uddin
f13bb6f53c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-01 16:35:21 +00:00
Chris Wren
82ef988c92 am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'b742c9a01261075d6a85f23d72e7842dec932cda':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 15:14:52 +00:00
Chris Wren
1d88c087e6 am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit '4afe428f49533342966545a14b51acaee9052c71':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 15:14:49 +00:00
Paul Jensen
18434fcc99 am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit 'a524b0f7869c7dc9b5687721883acfd9a535e440':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 15:14:45 +00:00
Alexandra Gherghina
a266670adf am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit 'd7275ae2c2e2ed8663b05d0560097c45d3e86019':
  Adds the ability to start a user in background
 2014-10-01 15:14:41 +00:00
Dianne Hackborn
30854356ef am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit '29a115235832fd4ea6f6cac1ad962a3bfe6e99be':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 15:14:38 +00:00
Winson Chung
3175f7d245 am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '2396f135678e8a40b963904e8a6710bc6a204180':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 15:14:34 +00:00
John Spurlock
eac6926f0c am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '260e6d542ff05094063f1a1574f41fa165308eef':
  Don't play hint animations when dozing
 2014-10-01 15:14:30 +00:00
Jason Monk
9e280c447f am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '15349991240bb9443d704b4ac85915f474e5108c':
  Pull roaming from mServiceState for consistency
 2014-10-01 15:14:26 +00:00
George Mount
6d7a0cd57f am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '3dc0a918748fade0ad7c683c6bc769f032759fcd':
  Clear preordered list after use.
 2014-10-01 15:14:22 +00:00
John Spurlock
3fd4440fea am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'af41d8477a8152c0597630066207a863ad74614e':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 15:14:18 +00:00
Chris Wren
b742c9a012 am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'c3328cacdad67623f94b13fceb734d958461a475':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 14:59:59 +00:00
Chris Wren
4afe428f49 am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit 'af098c5657942d645ec7362cc439718457abec64':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 14:59:55 +00:00
Paul Jensen
a524b0f786 am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '8df099df1516d23c113be3121635dcd34984a4a0':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 14:59:47 +00:00
Alexandra Gherghina
d7275ae2c2 am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit '75c33d9d04d8c0a9884a70077681261b57c7833c':
  Adds the ability to start a user in background
 2014-10-01 14:59:23 +00:00
Dianne Hackborn
29a1152358 am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 14:59:18 +00:00
Winson Chung
2396f13567 am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'e3206407a5968dcf6690793f047bdfede0424df5':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 14:59:12 +00:00
John Spurlock
260e6d542f am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
  Don't play hint animations when dozing
 2014-10-01 14:59:07 +00:00
Jason Monk
1534999124 am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
  Pull roaming from mServiceState for consistency
 2014-10-01 14:58:57 +00:00
George Mount
3dc0a91874 am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
  Clear preordered list after use.
 2014-10-01 14:58:53 +00:00
John Spurlock
af41d8477a am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 14:58:45 +00:00
Baligh Uddin
3a25e36cd5 am a88cbd6c: (-s ours) am 3e9bf6c6: (-s ours) am 3022aa21: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'a88cbd6c496b60649e398b1eb326abd419fce601':
  Import translations. DO NOT MERGE
 2014-10-01 05:41:55 +00:00
Baligh Uddin
c991f5030d am d73a85f3: (-s ours) am 2e459a66: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd73a85f36ef1a16ccfa56baf6925586faf2d4ee6':
  Import translations. DO NOT MERGE
 2014-10-01 05:36:35 +00:00
Baligh Uddin
a88cbd6c49 am 3e9bf6c6: (-s ours) am 3022aa21: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3e9bf6c69330d3e9b0f3d9424814b307532a64e9':
  Import translations. DO NOT MERGE
 2014-10-01 05:35:57 +00:00
Baligh Uddin
3e9bf6c693 am 3022aa21: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '3022aa2175e82cc67c51a70748ea6923876e9806':
  Import translations. DO NOT MERGE
 2014-10-01 05:31:30 +00:00
Baligh Uddin
7b8d760829 am 3bc8a117: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3bc8a11745d82106aa3fb38ecba0d0b579339513':
  Import translations. DO NOT MERGE
 2014-10-01 05:31:06 +00:00
Baligh Uddin
d73a85f36e am 2e459a66: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '2e459a6653f6254153005352a6fec812ce48f18d':
  Import translations. DO NOT MERGE
 2014-10-01 05:30:40 +00:00
Baligh Uddin
2e459a6653 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-01 04:25:39 +00:00
Baligh Uddin
3bc8a11745 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-01 04:25:37 +00:00