145383 Commits

Author SHA1 Message Date
John Spurlock
2ce95b204a am 13412093: am 6117200c: am 0ee346e7: Doze: Manage screen state + brightness when teasing.
* commit '134120937985b6f4a6cb4dcd65f81d9d46988df3':
  Doze: Manage screen state + brightness when teasing.
2014-07-23 21:59:53 +00:00
RoboErik
44d7c8d843 am 958debf4: am f8f71ad7: am a9faa459: Merge "Change "Media output" to "Cast" for MR Button" into lmp-dev
* commit '958debf45baa9a1eb2380dd8a8274d54dbf32e7d':
  Change "Media output" to "Cast" for MR Button
2014-07-23 21:59:49 +00:00
John Spurlock
fe13fa6d76 am 6117200c: am 0ee346e7: Doze: Manage screen state + brightness when teasing.
* commit '6117200cc4ff342e13bb9d1487dad9a2b787dbf1':
  Doze: Manage screen state + brightness when teasing.
2014-07-23 21:55:32 +00:00
RoboErik
ddf612436f am f8f71ad7: am a9faa459: Merge "Change "Media output" to "Cast" for MR Button" into lmp-dev
* commit 'f8f71ad7ff4fd3d55c4d6e91fd200689d084c463':
  Change "Media output" to "Cast" for MR Button
2014-07-23 21:55:26 +00:00
John Spurlock
66a7ca4971 am 0ee346e7: Doze: Manage screen state + brightness when teasing.
* commit '0ee346e7cf5d38284d1ff0f180f653c72cae72e6':
  Doze: Manage screen state + brightness when teasing.
2014-07-23 21:22:50 +00:00
John Spurlock
ed69bd661f Doze: Manage screen state + brightness when teasing.
Bug:15863249
Change-Id: I2e9574afd58594d1895777024529e90815c66913
2014-07-23 17:15:15 -04:00
RoboErik
ceab4684ff am a9faa459: Merge "Change "Media output" to "Cast" for MR Button" into lmp-dev
* commit 'a9faa4594f061dbe4748954340dfc780ab8f601d':
  Change "Media output" to "Cast" for MR Button
2014-07-23 21:12:00 +00:00
RoboErik
cb777b16ba am 9cec2027: am 989779bb: am ae5b411b: Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev
* commit '9cec202794d2483011472e2d3ee1524ed5d36bc2':
  Return appropriately scaled artwork to RemoteController
2014-07-23 20:56:21 +00:00
RoboErik
7b73c30812 am 989779bb: am ae5b411b: Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev
* commit '989779bba5811dfcf1d9c0ff12d21469dfac3b72':
  Return appropriately scaled artwork to RemoteController
2014-07-23 20:52:45 +00:00
RoboErik
188ae08ea2 am ae5b411b: Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev
* commit 'ae5b411b181e872c9a66fb504eb1ea789f601698':
  Return appropriately scaled artwork to RemoteController
2014-07-23 20:48:57 +00:00
Jeff Sharkey
19de3bddc9 am f131525b: am af043268: am 7bf4f48f: Remove APK observers.
* commit 'f131525b29457031615eb35903445aa4318a69df':
  Remove APK observers.
2014-07-23 20:38:15 +00:00
Yao Chen
7e9ad82d90 am 3f243a41: am b0bc2aad: am 9ea412ab: Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev
* commit '3f243a411e1d2f4b2500995d3a32560c0fc79222':
  various fixes in MediaBrowserItem and MediaBrowserService
2014-07-23 20:38:10 +00:00
Jeff Sharkey
ff33a988dd am af043268: am 7bf4f48f: Remove APK observers.
* commit 'af043268f0f27620be25de18109c7e1ba691906f':
  Remove APK observers.
2014-07-23 20:33:16 +00:00
Yao Chen
295a14956e am b0bc2aad: am 9ea412ab: Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev
* commit 'b0bc2aad61a11d97494f3e0e14e0b49c09563fbe':
  various fixes in MediaBrowserItem and MediaBrowserService
2014-07-23 20:33:12 +00:00
Jae Seo
8c4ea37021 am 40a7428f: am 3555e7c6: am e51d3b9d: Fix build
* commit '40a7428f2e2bded8623fb58409ae430fc8f80a3d':
  Fix build
2014-07-23 20:31:53 +00:00
Jeff Sharkey
477322fd43 am 7bf4f48f: Remove APK observers.
* commit '7bf4f48f7ca2c53a88b3aed6329a2d44eae7a96c':
  Remove APK observers.
2014-07-23 20:29:36 +00:00
Yao Chen
987c9361bf am 9ea412ab: Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev
* commit '9ea412ab9ecf1c78549542ce9f1715e814a7ba59':
  various fixes in MediaBrowserItem and MediaBrowserService
2014-07-23 20:29:33 +00:00
Jae Seo
9754a3a510 am 3555e7c6: am e51d3b9d: Fix build
* commit '3555e7c6693a170a2fb8c432c0b00b1f537074b1':
  Fix build
2014-07-23 20:28:01 +00:00
Jeff Sharkey
84e71d1d61 Remove APK observers.
Most app installations have migrated to the new cluster-style layout
where each app is placed in a unique directory.  There are now two
general issues with these observers:

We can't know when a push/sync has finished delivering all splits
for an app.  Also, inotify isn't recursive, so we'd have to manage
watches for each app directory.

Change-Id: I3770fa9059ddf80f933a3804714f2e52591fce49
2014-07-23 20:25:24 +00:00
Jae Seo
71e54815f3 am e51d3b9d: Fix build
* commit 'e51d3b9dcc88d5ed53dc429bff84a19a3a651a86':
  Fix build
2014-07-23 20:23:16 +00:00
Gabriel Peal
2e23f3b184 am 7062d88d: am 6aac8cf7: am f2b4f70b: Merge changes I925c8738,I1a8ad5c2 into lmp-dev
* commit '7062d88de40de8e6dd160bc9a10922aa0a9ff7d7':
  Added Action to PlaybackState
  Added QueueState, playUri, and playFromSearch.
2014-07-23 20:17:04 +00:00
Jae Seo
80bc75a71e Fix build
Change-Id: Icc1bf76ef748b10cc7ea745bc37c4e7bc0d7ff43
2014-07-23 13:16:46 -07:00
Gabriel Peal
e3daa56441 am 6aac8cf7: am f2b4f70b: Merge changes I925c8738,I1a8ad5c2 into lmp-dev
* commit '6aac8cf7bccf5ab47b89fa69d9963c123701bcbb':
  Added Action to PlaybackState
  Added QueueState, playUri, and playFromSearch.
2014-07-23 20:12:47 +00:00
Gabriel Peal
354526bc21 am f2b4f70b: Merge changes I925c8738,I1a8ad5c2 into lmp-dev
* commit 'f2b4f70b459928d796fa9efa925e979f73bbf6b8':
  Added Action to PlaybackState
  Added QueueState, playUri, and playFromSearch.
2014-07-23 20:08:20 +00:00
Robert Greenwalt
f57168ef86 am 678108fc: am 819917e3: am dc9d7aa7: Merge "Reenable logging." into lmp-dev
* commit '678108fc7ead5783040da41a87b2bc01a9a5c353':
  Reenable logging.
2014-07-23 19:57:15 +00:00
Robert Greenwalt
22aab81e2c am 819917e3: am dc9d7aa7: Merge "Reenable logging." into lmp-dev
* commit '819917e3eb54dacba025c8516ed7d8b5eeaf419b':
  Reenable logging.
2014-07-23 19:53:51 +00:00
Robert Greenwalt
e6d5bc4af6 am dc9d7aa7: Merge "Reenable logging." into lmp-dev
* commit 'dc9d7aa70adbf2f2d2e582d9164d72a3a98627ce':
  Reenable logging.
2014-07-23 19:49:06 +00:00
Tao Bai
d673c47491 am f56d307b: am d5874836: am 9ba09c25: Merge "WebView permission change" into lmp-dev
* commit 'f56d307b4b082c15a17898bf00fc2ee60a100386':
  WebView permission change
2014-07-23 19:32:00 +00:00
Tao Bai
deee14685d am d5874836: am 9ba09c25: Merge "WebView permission change" into lmp-dev
* commit 'd5874836d84053a2f887470200901008f6797735':
  WebView permission change
2014-07-23 19:28:00 +00:00
Eino-Ville Talvala
3eaf05593b am fc4bbebd: am 6cfa6b5b: am e2894174: Camera2: Fix callback operation
* commit 'fc4bbebdc5e35c1f5c932e1b6d9b266f68d6ce28':
  Camera2: Fix callback operation
2014-07-23 19:28:00 +00:00
Craig Mautner
8b0c934092 am 79c98fb1: am 41505285: am 59f55203: Disable back button goes to recents behavior
* commit '79c98fb136ca0b17250302f2e3b600d0ee129d92':
  Disable back button goes to recents behavior
2014-07-23 19:23:55 +00:00
Tao Bai
721df0ab36 am 9ba09c25: Merge "WebView permission change" into lmp-dev
* commit '9ba09c250c00bd97c8282c772d47a6728f9cd4e2':
  WebView permission change
2014-07-23 19:23:49 +00:00
Eino-Ville Talvala
9630b94a69 am 6cfa6b5b: am e2894174: Camera2: Fix callback operation
* commit '6cfa6b5b1ca3ecab93337835792f2afb71613d5a':
  Camera2: Fix callback operation
2014-07-23 19:23:47 +00:00
Eino-Ville Talvala
a2a045cab8 am e2894174: Camera2: Fix callback operation
* commit 'e289417427410e5892e252ac08d3b9569a68a21c':
  Camera2: Fix callback operation
2014-07-23 19:19:41 +00:00
Craig Mautner
699a295bb8 am 41505285: am 59f55203: Disable back button goes to recents behavior
* commit '41505285136f349f281df0dade79f17b353971ff':
  Disable back button goes to recents behavior
2014-07-23 19:19:38 +00:00
Craig Mautner
970c649ad8 am 59f55203: Disable back button goes to recents behavior
* commit '59f55203974be24596d2c2c4ca441e61a9ede963':
  Disable back button goes to recents behavior
2014-07-23 19:15:30 +00:00
Eino-Ville Talvala
2f75e7d7ef Camera2: Fix callback operation
- Remove CloseableLock use; looks to be incompatible with invocations during callbacks
- Replace with basic interface lock to be thread-safe
- Add intermediate callback thread to legacy mode to match cross-process one-way Binder
  semantics

Change-Id: Iecd4ff6cf260c5a13bd11b850177ccea93e25933
2014-07-23 19:14:10 +00:00
Prerepa Viswanadham
6ef301dbc5 am e2983f8c: am bdbd1b3b: am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
* commit 'e2983f8c83b0ce2f067322b07cf10c735cb044e8':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
2014-07-23 19:12:23 +00:00
Ye Wen
ec0fe24937 am 1a9a6cef: am dbbd116c: am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev
* commit '1a9a6cefcb5f79a3421eac3a62d212c34ca2e75d':
  Infer legacy network type for ConnectivityManager.requestNetwork
2014-07-23 19:12:19 +00:00
Prerepa Viswanadham
eaae99f288 am bdbd1b3b: am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
* commit 'bdbd1b3b6ba06e2c52ce375e4221df4853e88319':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
2014-07-23 19:05:44 +00:00
Ye Wen
bb1c3eeafe am dbbd116c: am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev
* commit 'dbbd116c9d1e67b67213e2be14f0198cf6e1b524':
  Infer legacy network type for ConnectivityManager.requestNetwork
2014-07-23 19:05:41 +00:00
Jason Monk
021fa35d2f am 06bbb1e7: am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev
* commit '06bbb1e71e17151b1de7827c9c59c8a14f00d87c':
  Make the 'locked' lock task not lock keyguard on exit
2014-07-23 19:00:15 +00:00
Prerepa Viswanadham
4e6867273a am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
* commit '244c2f47afa12e0d30918522ef8577f4a931623b':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
2014-07-23 18:59:35 +00:00
Ye Wen
38a8ec0db3 am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev
* commit 'a7d1baac96f73a64aa6e76a494724c2ed29a5456':
  Infer legacy network type for ConnectivityManager.requestNetwork
2014-07-23 18:59:30 +00:00
Craig Mautner
0b633fc121 Disable back button goes to recents behavior
Using a static final boolean to do this so if policy is changed it
can be enabled easily.

Also fix fetching task from wrong list. Was causing
ActivityNotFoundExceptions.

Fixes bug 16512561.

Change-Id: I9b47a86fd740d45104aa14712e71df830218c5a7
2014-07-23 18:58:08 +00:00
Jason Monk
a979c5573b am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev
* commit '01f4253b2d2d6e8e198f0adc57c9eb73ce8c136f':
  Make the 'locked' lock task not lock keyguard on exit
2014-07-23 18:56:27 +00:00
RoboErik
8880157ee0 Merge "Return appropriately scaled artwork to RemoteController" into lmp-dev 2014-07-23 18:56:15 +00:00
RoboErik
a259d35073 Return appropriately scaled artwork to RemoteController
RemoteController has an api to set the artwork size. This adds compatibility
code to do the exclusion or scaling of artwork to be consistent with old APIs.

bug:15618171
Change-Id: I8cc51750c03219d42d5f543419f8b46f9eb5b833
2014-07-23 13:25:02 -07:00
Yao Chen
f805afc4d7 Merge "various fixes in MediaBrowserItem and MediaBrowserService" into lmp-dev 2014-07-23 18:56:15 +00:00
Yao Chen
7e21fe8be9 various fixes in MediaBrowserItem and MediaBrowserService
Change-Id: I57f2a6728eea14ff6243fd68d21886599a5a12f4
2014-07-23 13:15:23 -07:00