157387 Commits

Author SHA1 Message Date
Kenny Guy
fb81844bc6 am 25be3cd6: Merge "Uninstall for all users should check device admins." into lmp-dev
* commit '25be3cd6719af42c41a6a99eea1034b00f39a825':
  Uninstall for all users should check device admins.
2014-09-26 19:43:33 +00:00
RoboErik
deadb32736 am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev
* commit 'cab05d54baa53bc542fa35f33e612f2c41746307':
  Disable MediaSessionLegacyHelper debugging
2014-09-26 19:43:28 +00:00
RoboErik
9eb73b705d am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev
* commit 'c80873d5fa3976c5f6c238fdc98d67bc22cddb72':
  Remove BT routes when BT is turned off
2014-09-26 19:43:25 +00:00
Selim Cinek
76de8226a8 am a9827245: Merge "Increased the falsing threshold when woken up by touch" into lmp-dev
* commit 'a98272456d72460e010d9b7206f82414b7d5034e':
  Increased the falsing threshold when woken up by touch
2014-09-26 19:43:20 +00:00
Kenny Guy
a2b48057e1 Merge "Uninstall for all users should check device admins." into lmp-dev 2014-09-26 16:36:43 +00:00
RoboErik
2b731e7b7c Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 2014-09-26 16:25:45 +00:00
RoboErik
9b2e567ad4 Merge "Remove BT routes when BT is turned off" into lmp-dev 2014-09-26 16:25:29 +00:00
Deepanshu Gupta
db45ab697d am 351b7982: am f0ebe2fa: am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNa
* commit '351b7982a933e90f5aef6571b1e0581bbc411945':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:21:16 +00:00
Deepanshu Gupta
a68933ec84 am 3f86a402: am 2dd837cd: (-s ours) am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '3f86a4028bde53858a82f05ea369cc401bff6284':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:21:12 +00:00
Deepanshu Gupta
dc5b4ff998 am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '90f23349cd139aedd6e3029f71763d3e0ecde0f8':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:21:08 +00:00
Justin Koh
9e8ed0be73 am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
* commit 'c4e233e660db990b9b7759f274afda88d44bd036':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
2014-09-26 16:21:04 +00:00
Craig Mautner
f8010b67b9 am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths
* commit '0d604359272d89c7e984a9aff978cee89a9954c8':
  DO NOT MERGE Fix race condition between binder deaths
2014-09-26 16:21:01 +00:00
Deepanshu Gupta
664a0d2f10 am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '7ef65757bf3ed611d66f07406d6df83983d791af':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:20:57 +00:00
Deepanshu Gupta
b116a6aefa am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'fdf5fe8f1121770839b713be257dbc3cc41613e5':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:20:53 +00:00
Selim Cinek
40968da1b7 Merge "Increased the falsing threshold when woken up by touch" into lmp-dev 2014-09-26 16:16:36 +00:00
Deepanshu Gupta
743ee98c68 am f0ebe2fa: am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NO
* commit 'f0ebe2fa14e71270e6ea159d3734c1ccc2348030':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:11:49 +00:00
Deepanshu Gupta
c9b7cb5b9b am 2dd837cd: (-s ours) am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '2dd837cdafd8ce6d2c3db7da20b92a74418f41a6':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:11:43 +00:00
Deepanshu Gupta
23d43a0cc4 am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'a7045a43ca83d65134a54236ed0ead7751ee7377':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:11:38 +00:00
Justin Koh
c483a392ce am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
* commit '1c487938c45317997389b9ad101fc6739e3fe847':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
2014-09-26 16:11:33 +00:00
Craig Mautner
66beed58c1 am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths
* commit '6ae7ea942fc89b1899da267253c5c78596ef5aa1':
  DO NOT MERGE Fix race condition between binder deaths
2014-09-26 16:11:29 +00:00
Deepanshu Gupta
0a7d7ce140 am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '9fcacf52d0277b0c0485638637ea357721f8c635':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:11:25 +00:00
Deepanshu Gupta
71c8349ba8 am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'ac892f688f206eab746fac1bbe85c9f76657f8d6':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 16:11:19 +00:00
Yao Chen
6f05ae578e am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
* commit '86d778155f077d5af10f43d0eb7b04584559e793':
  Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
2014-09-26 16:02:43 +00:00
Yao Chen
08fccd0093 Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev 2014-09-26 15:55:52 +00:00
Philip Nowell
af9152a557 am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
* commit '571730b4d1a438fadfdb2c6951483f00f6276518':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
2014-09-26 15:09:39 +00:00
Philip Nowell
31a141af13 Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 2014-09-26 15:00:22 +00:00
Selim Cinek
34cf5c4bfc Increased the falsing threshold when woken up by touch
Bug: 17649103
Change-Id: Iea4736a761a1108e7832aa62cc2060ea0bd89376
2014-09-26 16:31:57 +02:00
Przemyslaw Szczepaniak
c1139b3e3f am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev
* commit 'f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
  Fix ambiguous TTS#playSilence method.
2014-09-26 09:17:05 +00:00
Przemyslaw Szczepaniak
759962ab6d Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 2014-09-26 08:11:23 +00:00
Deepanshu Gupta
f0ebe2fa14 am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'f202365ecca0b6ed637f679c8dd3a36ff850ddfe':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 06:15:55 +00:00
Deepanshu Gupta
f202365ecc am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '8c61344d89ab3b1f02228b3da10c8377c41960ff':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 06:05:03 +00:00
Deepanshu Gupta
2dd837cdaf am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '416b74fe31124d21f14bb5900f4872cdf62f08e0':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:55:34 +00:00
Deepanshu Gupta
8c61344d89 am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '528b58623feee609055a31e58bf5e1ea3658bf40':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:53:47 +00:00
Deepanshu Gupta
528b58623f am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '941a8f03599b91f752c455dceef993887c4b9b20':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:43:38 +00:00
Deepanshu Gupta
416b74fe31 am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'ab5971d825d9d59f06b49e1f1e66a24df417124e':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:43:32 +00:00
Deepanshu Gupta
ab5971d825 am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '1489862ecee4f298de6a7b27789dda08ff4aa4cf':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:34:34 +00:00
Deepanshu Gupta
941a8f0359 am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '0c4893ece99418842538db496bb8d53b767b335b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:32:09 +00:00
Deepanshu Gupta
1489862ece am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '48d0fd99f0a25829f191e7f7ed35cf8d0a2b5902':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:24:06 +00:00
Deepanshu Gupta
0c4893ece9 am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '2889942f4ee7762cdbd097cf3ceea16444f8841a':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:20:48 +00:00
Deepanshu Gupta
48d0fd99f0 am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'ee41b79c5735bb3399108bb62de1145fffff3904':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:13:09 +00:00
Deepanshu Gupta
2889942f4e am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'bfeeee8e4a9cf4bf32067c2ca5807cd612564a99':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:09:54 +00:00
Deepanshu Gupta
bfeeee8e4a am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'ecbe6045911ac7c05a1e999b966577ef7b1bdc18':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 05:02:22 +00:00
Deepanshu Gupta
ee41b79c57 am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 04:57:59 +00:00
Deepanshu Gupta
ecbe604591 am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '6950920f19980a2416e156d2337b93e386b3f8be':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 04:49:31 +00:00
Deepanshu Gupta
7d23e405bd am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'f103317499bdb12cbcac1754899756d22acde986':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 04:40:53 +00:00
Deepanshu Gupta
6950920f19 am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '1fce990ce9098afe96e75ec1583c771826c50637':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 04:37:23 +00:00
Deepanshu Gupta
1fce990ce9 am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '04861ed488f5aaa62acbaf903e359ea9edd8e9f9':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 04:22:39 +00:00
Deepanshu Gupta
a7045a43ca am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit 'eb31708e7d14db1a54bf0f38452149c7d984517f':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 03:12:42 +00:00
Deepanshu Gupta
eb31708e7d am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '83951615f564521d542da00d3bf60a372787aced':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 03:00:29 +00:00
Deepanshu Gupta
83951615f5 am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '467aea1722f5cd73d0874502447d947bccd13c99':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
2014-09-26 02:49:04 +00:00