OSDN Git Service

android-x86/frameworks-base.git
9 years agoam c8984961: am 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTT...
Chien-Yu Chen [Wed, 8 Jul 2015 21:31:34 +0000 (21:31 +0000)]
am c8984961: am 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev

* commit 'c8984961604cdcf0e2744d461e08c32bdf6918ab':
  Camera: Enforce ZERO_SHUTTER_LAG mode

9 years agoam 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode...
Chien-Yu Chen [Wed, 8 Jul 2015 21:16:06 +0000 (21:16 +0000)]
am 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev

* commit '73d7cfea9359ad69bc4b39a348a03f6f34dd1fac':
  Camera: Enforce ZERO_SHUTTER_LAG mode

9 years agoam 79f44602: am eeb5b9d0: am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom...
Tingting Wang [Wed, 8 Jul 2015 21:02:21 +0000 (21:02 +0000)]
am 79f44602: am eeb5b9d0: am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev

* commit '79f44602a4cae17f262b024c9349c04d8dbcc5cf':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.

9 years agoam be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
Chien-Yu Chen [Wed, 8 Jul 2015 21:01:58 +0000 (21:01 +0000)]
am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev

* commit 'be0a7a0d02099af42e982f8370bc81dad612e91b':
  Camera: Enforce ZERO_SHUTTER_LAG mode

9 years agoam 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
Chien-Yu Chen [Wed, 8 Jul 2015 20:47:16 +0000 (20:47 +0000)]
am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev

* commit '3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0':
  Camera: Enforce ZERO_SHUTTER_LAG mode

9 years agoam eeb5b9d0: am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE...
Tingting Wang [Wed, 8 Jul 2015 20:47:05 +0000 (20:47 +0000)]
am eeb5b9d0: am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev

* commit 'eeb5b9d06e6ddb83749771a497e03547851d0ea0':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.

9 years agoam 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part...
Tingting Wang [Wed, 8 Jul 2015 20:35:01 +0000 (20:35 +0000)]
am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev

* commit '0f4595afd0d9b529fa2464085f526b1d9edd73aa':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.

9 years agoMerge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
Chien-Yu Chen [Wed, 8 Jul 2015 20:34:27 +0000 (20:34 +0000)]
Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev

9 years agoam ab910eb9: am f2d70428: am b5501efc: am d25093d2: Merge "Reject AlgorithmParameters...
Alex Klyubin [Wed, 8 Jul 2015 20:24:20 +0000 (20:24 +0000)]
am ab910eb9: am f2d70428: am b5501efc: am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev

* commit 'ab910eb92029da2828f2ccd1165da0ea73c0c224':
  Reject AlgorithmParameters of wrong type.

9 years agoam 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
Tingting Wang [Wed, 8 Jul 2015 20:20:20 +0000 (20:20 +0000)]
am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev

* commit '4ccf69e1191244ee104edd74843fc7ae391c5270':
  Don't display Custom for PHONE_TYPE=CUSTOM part 1.

9 years agoam f2d70428: am b5501efc: am d25093d2: Merge "Reject AlgorithmParameters of wrong...
Alex Klyubin [Wed, 8 Jul 2015 20:09:12 +0000 (20:09 +0000)]
am f2d70428: am b5501efc: am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev

* commit 'f2d70428543727e0c6031e33ce4445ad9589ef6f':
  Reject AlgorithmParameters of wrong type.

9 years agoMerge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
Tingting Wang [Wed, 8 Jul 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev

9 years agoDon't display Custom for PHONE_TYPE=CUSTOM part 1.
Tingting Wang [Tue, 7 Jul 2015 23:58:13 +0000 (16:58 -0700)]
Don't display Custom for PHONE_TYPE=CUSTOM part 1.

Dialer sometimes creates custom PHONE_TYPE values without
specifying the custom string. In this case, we shouldn't
display "Custom". We should display nothing.

BUG 21900262

Change-Id: I11aff369c76126a3f60f95aa589ae2a8a3e98bb1

9 years agoam b5501efc: am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into...
Alex Klyubin [Wed, 8 Jul 2015 19:55:10 +0000 (19:55 +0000)]
am b5501efc: am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev

* commit 'b5501efcddb800cdc6b41863e8c4df2c1e0012ec':
  Reject AlgorithmParameters of wrong type.

9 years agoam 402ad701: am bd966fb0: am e35c2d2f: am 3aa1b1e5: Merge "Lock screen text: consider...
Etan Cohen [Wed, 8 Jul 2015 19:49:21 +0000 (19:49 +0000)]
am 402ad701: am bd966fb0: am e35c2d2f: am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev

* commit '402ad701c5cd6f3043c00c5109d0416c4a16858e':
  Lock screen text: consider possible WFC service in APM

9 years agoam 71aa3b21: am 0d959fd4: am 7617f55e: am a8c247e0: Merge "Fixed a bug where collapse...
Selim Cinek [Wed, 8 Jul 2015 19:49:16 +0000 (19:49 +0000)]
am 71aa3b21: am 0d959fd4: am 7617f55e: am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev

* commit '71aa3b21e3024cd208576b987db07da90d463d02':
  Fixed a bug where collapserunnables where dropped

9 years agoam d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev
Alex Klyubin [Wed, 8 Jul 2015 19:41:07 +0000 (19:41 +0000)]
am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev

* commit 'd25093d2fd151638a108a110484e579cc1dcaf54':
  Reject AlgorithmParameters of wrong type.

9 years agoam bd966fb0: am e35c2d2f: am 3aa1b1e5: Merge "Lock screen text: consider possible...
Etan Cohen [Wed, 8 Jul 2015 19:35:21 +0000 (19:35 +0000)]
am bd966fb0: am e35c2d2f: am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev

* commit 'bd966fb069dd823753f2f37ca5297a6632af9c97':
  Lock screen text: consider possible WFC service in APM

9 years agoam 0d959fd4: am 7617f55e: am a8c247e0: Merge "Fixed a bug where collapserunnables...
Selim Cinek [Wed, 8 Jul 2015 19:35:13 +0000 (19:35 +0000)]
am 0d959fd4: am 7617f55e: am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev

* commit '0d959fd4d350c1bec2b2d2fe8d1369d53dd42940':
  Fixed a bug where collapserunnables where dropped

9 years agoMerge "Reject AlgorithmParameters of wrong type." into mnc-dev
Alex Klyubin [Wed, 8 Jul 2015 19:32:02 +0000 (19:32 +0000)]
Merge "Reject AlgorithmParameters of wrong type." into mnc-dev

9 years agoam e35c2d2f: am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service...
Etan Cohen [Wed, 8 Jul 2015 19:22:05 +0000 (19:22 +0000)]
am e35c2d2f: am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev

* commit 'e35c2d2fbc3f5f25db006a51a6e2bc9169389b35':
  Lock screen text: consider possible WFC service in APM

9 years agoam 7617f55e: am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped...
Selim Cinek [Wed, 8 Jul 2015 19:21:59 +0000 (19:21 +0000)]
am 7617f55e: am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev

* commit '7617f55ed14a55c2e314038373ca3f85e378c62a':
  Fixed a bug where collapserunnables where dropped

9 years agoam 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into...
Etan Cohen [Wed, 8 Jul 2015 19:10:19 +0000 (19:10 +0000)]
am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev

* commit '3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf':
  Lock screen text: consider possible WFC service in APM

9 years agoam a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev
Selim Cinek [Wed, 8 Jul 2015 19:10:15 +0000 (19:10 +0000)]
am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev

* commit 'a8c247e0b4e14123f85cec00500144ff28aaf6ed':
  Fixed a bug where collapserunnables where dropped

9 years agoMerge "Lock screen text: consider possible WFC service in APM" into mnc-dev
Etan Cohen [Wed, 8 Jul 2015 19:02:31 +0000 (19:02 +0000)]
Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev

9 years agoMerge "Fixed a bug where collapserunnables where dropped" into mnc-dev
Selim Cinek [Wed, 8 Jul 2015 18:55:32 +0000 (18:55 +0000)]
Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev

9 years agoCamera: Enforce ZERO_SHUTTER_LAG mode
Chien-Yu Chen [Wed, 8 Jul 2015 18:55:19 +0000 (11:55 -0700)]
Camera: Enforce ZERO_SHUTTER_LAG mode

Camera devices that support YUV or PRIVATE reprocessing must list
ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and
android.noiseReduction.availableNoiseReductionModes, and it must
be the default mode for ZSL template.

Bug: 22266686
Change-Id: I4728b2261760d11d695e9e364d8a72b3b2d31284

9 years agoam 7b12deb5: am 07e1c409: Merge "Android always has <malloc.h>."
Elliott Hughes [Wed, 8 Jul 2015 18:44:17 +0000 (18:44 +0000)]
am 7b12deb5: am 07e1c409: Merge "Android always has <malloc.h>."

* commit '7b12deb50b32bced71a9472027350fafbbe40bd4':
  Android always has <malloc.h>.

9 years agoLock screen text: consider possible WFC service in APM
Etan Cohen [Mon, 6 Jul 2015 23:19:04 +0000 (16:19 -0700)]
Lock screen text: consider possible WFC service in APM

Bug: 22302226
Change-Id: Icd885b45ced2b57665fbed54ec6caac36839db6c

9 years agoam 07e1c409: Merge "Android always has <malloc.h>."
Elliott Hughes [Wed, 8 Jul 2015 18:33:11 +0000 (18:33 +0000)]
am 07e1c409: Merge "Android always has <malloc.h>."

* commit '07e1c409acc375ae88b6cc73fe4541db529c9638':
  Android always has <malloc.h>.

9 years agoam 91791b43: am 066b4047: am 0caac8ea: am fede4258: Merge "Remove bang from not conne...
Jason Monk [Wed, 8 Jul 2015 18:20:40 +0000 (18:20 +0000)]
am 91791b43: am 066b4047: am 0caac8ea: am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev

* commit '91791b432ee34e96990decc57790b02f5a9e9d1c':
  Remove bang from not connected wifi

9 years agoam 373a0b5c: am dfea212b: am 070df444: am c0344a80: Merge "audio: add definitions...
Eric Laurent [Wed, 8 Jul 2015 18:20:33 +0000 (18:20 +0000)]
am 373a0b5c: am dfea212b: am 070df444: am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev

* commit '373a0b5c602c5826cc0ab6642446981ccb52883c':
  audio: add definitions for devices connected over IP

9 years agoMerge "Android always has <malloc.h>."
Elliott Hughes [Wed, 8 Jul 2015 18:12:21 +0000 (18:12 +0000)]
Merge "Android always has <malloc.h>."

9 years agoam 066b4047: am 0caac8ea: am fede4258: Merge "Remove bang from not connected wifi...
Jason Monk [Wed, 8 Jul 2015 18:06:07 +0000 (18:06 +0000)]
am 066b4047: am 0caac8ea: am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev

* commit '066b4047f40d7d2b88542738bb6651a51d50c66e':
  Remove bang from not connected wifi

9 years agoam f5e72737: (-s ours) am c8da7d53: (-s ours) am 3c573bc5: (-s ours) am 4f5630e5...
Geoff Mendal [Wed, 8 Jul 2015 18:06:07 +0000 (18:06 +0000)]
am f5e72737: (-s ours) am c8da7d53: (-s ours) am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f5e7273796ca1a7e5f3cbe9975197aea15feda1a':
  Import translations. DO NOT MERGE

9 years agoam dfea212b: am 070df444: am c0344a80: Merge "audio: add definitions for devices...
Eric Laurent [Wed, 8 Jul 2015 18:06:00 +0000 (18:06 +0000)]
am dfea212b: am 070df444: am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev

* commit 'dfea212b18025a8899bf5e99f18f9506c43ac5b5':
  audio: add definitions for devices connected over IP

9 years agoam 0caac8ea: am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev
Jason Monk [Wed, 8 Jul 2015 17:51:27 +0000 (17:51 +0000)]
am 0caac8ea: am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev

* commit '0caac8ea19f19d1051bb336e31d56370244f1589':
  Remove bang from not connected wifi

9 years agoam 070df444: am c0344a80: Merge "audio: add definitions for devices connected over...
Eric Laurent [Wed, 8 Jul 2015 17:51:23 +0000 (17:51 +0000)]
am 070df444: am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev

* commit '070df444930cd9148998759bf30012937a56e564':
  audio: add definitions for devices connected over IP

9 years agoam c8da7d53: (-s ours) am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import...
Geoff Mendal [Wed, 8 Jul 2015 17:51:22 +0000 (17:51 +0000)]
am c8da7d53: (-s ours) am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'c8da7d5366ee92a81d92d7e5c18fd769a1961032':
  Import translations. DO NOT MERGE

9 years agoam 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 8 Jul 2015 17:39:29 +0000 (17:39 +0000)]
am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '3c573bc5699924f5c393043847b011669b718a67':
  Import translations. DO NOT MERGE

9 years agoam fede4258: Merge "Remove bang from not connected wifi" into mnc-dev
Jason Monk [Wed, 8 Jul 2015 17:38:57 +0000 (17:38 +0000)]
am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev

* commit 'fede4258fa1bf880c2b88ebea3c886003662fc74':
  Remove bang from not connected wifi

9 years agoam c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
Eric Laurent [Wed, 8 Jul 2015 17:38:53 +0000 (17:38 +0000)]
am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev

* commit 'c0344a80fdb889c2b94dcfb869edf2afc5bb60df':
  audio: add definitions for devices connected over IP

9 years agoMerge "Remove bang from not connected wifi" into mnc-dev
Jason Monk [Wed, 8 Jul 2015 17:26:33 +0000 (17:26 +0000)]
Merge "Remove bang from not connected wifi" into mnc-dev

9 years agoMerge "audio: add definitions for devices connected over IP" into mnc-dev
Eric Laurent [Wed, 8 Jul 2015 17:24:22 +0000 (17:24 +0000)]
Merge "audio: add definitions for devices connected over IP" into mnc-dev

9 years agoam 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 17:00:13 +0000 (17:00 +0000)]
am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '4f5630e51d03980e80fde93154f5a0302c8179a2':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 16:45:07 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 16:38:01 +0000 (11:38 -0500)]
Import translations. DO NOT MERGE

Change-Id: I81911866f73a1274582b6c93803eebff7e0e229e
Auto-generated-cl: translation import

9 years agoam 0ea996cf: am 62a65071: am dcf8837d: Merge "Restrict number of hwuiTask threads...
John Reck [Wed, 8 Jul 2015 16:20:02 +0000 (16:20 +0000)]
am 0ea996cf: am 62a65071: am dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev

* commit '0ea996cfe257785dfcb65724fcb270361f1e8ea0':
  Restrict number of hwuiTask threads

9 years agoRemove bang from not connected wifi
Jason Monk [Wed, 8 Jul 2015 16:09:52 +0000 (12:09 -0400)]
Remove bang from not connected wifi

Bug: 22281118
Change-Id: I4752c0e7378fca4a94c73083a8a394cde7d6f170

9 years agoam 62a65071: am dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev
John Reck [Wed, 8 Jul 2015 16:07:18 +0000 (16:07 +0000)]
am 62a65071: am dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev

* commit '62a650715df7aa29c9913d8bb064a8845eeda110':
  Restrict number of hwuiTask threads

9 years agoam dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev
John Reck [Wed, 8 Jul 2015 15:51:25 +0000 (15:51 +0000)]
am dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev

* commit 'dcf8837d4902ea50f2421eecde64fe55e3d98b28':
  Restrict number of hwuiTask threads

9 years agoam 289e9ebf: am b9b021d0: am 4c0c6739: am 32c4802a: Merge "provide a cleaner notifica...
Chris Wren [Wed, 8 Jul 2015 15:42:47 +0000 (15:42 +0000)]
am 289e9ebf: am b9b021d0: am 4c0c6739: am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev

* commit '289e9ebf32480cd8d79a780ae1aff837cff2de2e':
  provide a cleaner notification dump

9 years agoMerge "Restrict number of hwuiTask threads" into mnc-dr-dev
John Reck [Wed, 8 Jul 2015 15:40:42 +0000 (15:40 +0000)]
Merge "Restrict number of hwuiTask threads" into mnc-dr-dev

9 years agoam b9b021d0: am 4c0c6739: am 32c4802a: Merge "provide a cleaner notification dump...
Chris Wren [Wed, 8 Jul 2015 15:29:04 +0000 (15:29 +0000)]
am b9b021d0: am 4c0c6739: am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev

* commit 'b9b021d0d81312766aa1d72bda10bb06363fb85f':
  provide a cleaner notification dump

9 years agoam 4c0c6739: am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev
Chris Wren [Wed, 8 Jul 2015 15:14:57 +0000 (15:14 +0000)]
am 4c0c6739: am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev

* commit '4c0c6739d6b22ac84f24d53250e239f5e97b5470':
  provide a cleaner notification dump

9 years agoam 6097f946: (-s ours) am 6760080b: (-s ours) am f63da31f: (-s ours) am db586e69...
Geoff Mendal [Wed, 8 Jul 2015 15:00:21 +0000 (15:00 +0000)]
am 6097f946: (-s ours) am 6760080b: (-s ours) am f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '6097f946d1e3bff27a49899027c1ad31a96518ef':
  Import translations. DO NOT MERGE

9 years agoam cb1486d0: (-s ours) am 1fee4952: (-s ours) am 1e9b3cff: (-s ours) am 18d4eaf5...
Geoff Mendal [Wed, 8 Jul 2015 15:00:11 +0000 (15:00 +0000)]
am cb1486d0: (-s ours) am 1fee4952: (-s ours) am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'cb1486d0fa703866c29d11872588215259e819fd':
  Import translations. DO NOT MERGE

9 years agoam 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev
Chris Wren [Wed, 8 Jul 2015 14:59:51 +0000 (14:59 +0000)]
am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev

* commit '32c4802a8ac624e0426888612533a4d649f349b9':
  provide a cleaner notification dump

9 years agoam 6760080b: (-s ours) am f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import...
Geoff Mendal [Wed, 8 Jul 2015 14:47:59 +0000 (14:47 +0000)]
am 6760080b: (-s ours) am f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '6760080b5ec853f75d3775585de347429d23aee9':
  Import translations. DO NOT MERGE

9 years agoam 1fee4952: (-s ours) am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import...
Geoff Mendal [Wed, 8 Jul 2015 14:47:53 +0000 (14:47 +0000)]
am 1fee4952: (-s ours) am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '1fee49529e6310a2fc163f004e5f5299d006cb2f':
  Import translations. DO NOT MERGE

9 years agoam 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPerm...
Benjamin Franz [Wed, 8 Jul 2015 14:47:52 +0000 (14:47 +0000)]
am 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit '12ceccaf7aa4198bb578bcba844729c0ac146d6d':
  Clarify javadoc of setPermissionPolicy

9 years agoam 06ed218d: (-s ours) am 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246...
Geoff Mendal [Wed, 8 Jul 2015 14:47:47 +0000 (14:47 +0000)]
am 06ed218d: (-s ours) am 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit '06ed218ddcb92e0f5b20bdec70bb65b2c29c04f1':
  Import translations. DO NOT MERGE

9 years agoMerge "provide a cleaner notification dump" into mnc-dev
Chris Wren [Wed, 8 Jul 2015 14:46:30 +0000 (14:46 +0000)]
Merge "provide a cleaner notification dump" into mnc-dev

9 years agoam 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy...
Benjamin Franz [Wed, 8 Jul 2015 14:33:38 +0000 (14:33 +0000)]
am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit '4b7d3b477f4405d5afe7f116e14037ac7c70e414':
  Clarify javadoc of setPermissionPolicy

9 years agoam 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translati...
Geoff Mendal [Wed, 8 Jul 2015 14:33:33 +0000 (14:33 +0000)]
am 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit '5e60e7c1030630f4052fd29982c15fd4ed78ec5e':
  Import translations. DO NOT MERGE

9 years agoam f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 8 Jul 2015 14:32:50 +0000 (14:32 +0000)]
am f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f63da31f530ad43989f4269b22552df5ba3c15f7':
  Import translations. DO NOT MERGE

9 years agoam 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 8 Jul 2015 14:32:47 +0000 (14:32 +0000)]
am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '1e9b3cffb910c63b568348aa6a21637ed208a087':
  Import translations. DO NOT MERGE

9 years agoam 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
Benjamin Franz [Wed, 8 Jul 2015 14:18:28 +0000 (14:18 +0000)]
am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit '051762f77d5bf2c0dcbb05786ac5ae81086d596c':
  Clarify javadoc of setPermissionPolicy

9 years agoam eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 14:18:24 +0000 (14:18 +0000)]
am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit 'eaaae47d8901dd59a536181e07d585fe29dc53cd':
  Import translations. DO NOT MERGE

9 years agoam db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 14:18:11 +0000 (14:18 +0000)]
am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'db586e69afc71cbc9864849e29e77bf3b6d5ba3c':
  Import translations. DO NOT MERGE

9 years agoam 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 14:18:07 +0000 (14:18 +0000)]
am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '18d4eaf54a60caaa2ffeae810a435bfad4abb59d':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 14:05:53 +0000 (14:05 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 14:04:00 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoam c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
Benjamin Franz [Wed, 8 Jul 2015 14:03:46 +0000 (14:03 +0000)]
am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit 'c088e30fd403b9843a00cc311e460734bd111c26':
  Clarify javadoc of setPermissionPolicy

9 years agoam 20ad9246: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 14:03:42 +0000 (14:03 +0000)]
am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit '20ad92460bf180abb1d2a154e8ec007ca2330e6d':
  Import translations. DO NOT MERGE

9 years agoMerge "Clarify javadoc of setPermissionPolicy" into mnc-dev
Benjamin Franz [Wed, 8 Jul 2015 13:59:29 +0000 (13:59 +0000)]
Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:54:50 +0000 (06:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5480292e44e527d094f57361680708eba4aef6d8
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:48:51 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5571e07743dcea7a5e3f064599480796132cc31c
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 13:43:44 +0000 (06:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: I173b85dbcf36fdc7023137949f7bb416dabc2cf5
Auto-generated-cl: translation import

9 years agoClarify javadoc of setPermissionPolicy
Benjamin Franz [Wed, 8 Jul 2015 13:24:14 +0000 (14:24 +0100)]
Clarify javadoc of setPermissionPolicy

Bug: 22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a

9 years agoam ea199bae: am 116183ac: am 37186001: am e3bb8e43: am cc040d58: am 7e8358c6: Merge...
Dirk Dougherty [Wed, 8 Jul 2015 12:55:30 +0000 (12:55 +0000)]
am ea199bae: am 116183ac: am 37186001: am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit 'ea199baedbe098e7abbbc152cd40dc5949b4c1ab':
  Doc change -- update trade practices link.

9 years agoam 2fbfe429: am 92c1d283: am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocki...
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:55:25 +0000 (12:55 +0000)]
am 2fbfe429: am 92c1d283: am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

* commit '2fbfe42955520c6831fd5df94d87ada875f9299b':
  Prevent accidental unlocking of USB data transfer.

9 years agoam 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detai...
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:55:18 +0000 (12:55 +0000)]
am 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev

* commit '5bc85aa8dbfdf03a5e764e74c415189c1bfa591c':
  Expose time-interval detail query on INetworkStatsSession

9 years agoam f125efa4: am d9f16aea: am af3c755c: am bc243440: am 590a25a3: am 70f1aadd: Doc...
Dirk Dougherty [Wed, 8 Jul 2015 12:55:04 +0000 (12:55 +0000)]
am f125efa4: am d9f16aea: am af3c755c: am bc243440: am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.

* commit 'f125efa4d8bb5d165c03a2cc6eea4396cf98d693':
  Doc change: add version notes for preview 2.

9 years agoam 2358d5c3: am e9233f05: am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement...
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:54:58 +0000 (12:54 +0000)]
am 2358d5c3: am e9233f05: am a626f8d8: am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

* commit '2358d5c3af6b350028eda483af2944570182f348':
  Make StorageMeasurement multiprofile aware.

9 years agoam b8c1a523: am 3a821b62: am 77f579f9: am 8ecba862: am 638ecb76: am 773861f0: Merge...
Dirk Dougherty [Wed, 8 Jul 2015 12:54:51 +0000 (12:54 +0000)]
am b8c1a523: am 3a821b62: am 77f579f9: am 8ecba862: am 638ecb76: am 773861f0: Merge "Docs: Localized landing pages for M Preview 2 release." into mnc-preview-docs

* commit 'b8c1a523e4d68c91e47be333528c826baf8a5f5a':
  Docs: Localized landing pages for M Preview 2 release.

9 years agoam 4a6ac2c2: am 6042b4ce: am 9a2351c0: am d3967e3f: am 0922b82a: am a7e0bfa6: Docs...
David Friedman [Wed, 8 Jul 2015 12:54:43 +0000 (12:54 +0000)]
am 4a6ac2c2: am 6042b4ce: am 9a2351c0: am d3967e3f: am 0922b82a: am a7e0bfa6: Docs: Updates to M Preview 2 Download pages.

* commit '4a6ac2c2bf2ec17bab59913af128428d5846cfa9':
  Docs: Updates to M Preview 2 Download pages.

9 years agoam fbf307df: am 5e3c1946: am d63bc307: am a939d7e8: am cb7a3b6b: am 201cfff4: Merge...
David Friedman [Wed, 8 Jul 2015 12:54:32 +0000 (12:54 +0000)]
am fbf307df: am 5e3c1946: am d63bc307: am a939d7e8: am cb7a3b6b: am 201cfff4: Merge "Docs: Updated download page for M Preview; new archive page for older versions" into mnc-preview-docs

* commit 'fbf307dfa5128e9842dbc3db5a8e95ead9304683':
  Docs: Updated download page for M Preview; new archive page for older versions

9 years agoam e690eae7: am 0a79ae6f: am 99f5f80e: am f6fd4ef8: am 73ce8abb: am 869050b3: Docs...
David Friedman [Wed, 8 Jul 2015 12:54:26 +0000 (12:54 +0000)]
am e690eae7: am 0a79ae6f: am 99f5f80e: am f6fd4ef8: am 73ce8abb: am 869050b3: Docs: Updated Preview TOC reflecting the newly localized pages.

* commit 'e690eae7a5479f86bfdf529e391532cf48105c2f':
  Docs: Updated Preview TOC reflecting the newly localized pages.

9 years agoam b91f34bf: am 4c90d9ae: am bf291475: am e32f9c88: Merge changes I29f7abe6,I6c831467...
Deepanshu Gupta [Wed, 8 Jul 2015 12:54:19 +0000 (12:54 +0000)]
am b91f34bf: am 4c90d9ae: am bf291475: am e32f9c88: Merge changes I29f7abe6,I6c831467 into mnc-dev

* commit 'b91f34bf7591c42579c4c18de24237aae2ba3154':
  Fix Paint_Delegate.native_getRunAdvance()
  Add a default PackageManager to BridgeContext.

9 years agoam 4279b2a4: am 18a5e88c: am 7e4414f2: am 65d4f7a6: Merge changes Id0595c4b,Ia1a3e8c3...
Deepanshu Gupta [Wed, 8 Jul 2015 12:54:14 +0000 (12:54 +0000)]
am 4279b2a4: am 18a5e88c: am 7e4414f2: am 65d4f7a6: Merge changes Id0595c4b,Ia1a3e8c3 into mnc-dev

* commit '4279b2a486dba9719b96c81000f4717adf302cfc':
  Revert "Replace infinite loop with foreach."
  Update intellij project for tools-common sources.

9 years agoam 4cdf77a5: am 8ff5a95a: am d6072387: am a4546b0e: Merge "Implement tools:list_item...
Deepanshu Gupta [Wed, 8 Jul 2015 12:54:08 +0000 (12:54 +0000)]
am 4cdf77a5: am 8ff5a95a: am d6072387: am a4546b0e: Merge "Implement tools:list_item for RecyclerView." into mnc-dev

* commit '4cdf77a54b36b05e4d7da4776785027f14c23e90':
  Implement tools:list_item for RecyclerView.

9 years agoam 67e18486: am c3c3b92c: am 12c05a24: am 0c784ffa: Merge "Add roundess to configurat...
Deepanshu Gupta [Wed, 8 Jul 2015 12:54:03 +0000 (12:54 +0000)]
am 67e18486: am c3c3b92c: am 12c05a24: am 0c784ffa: Merge "Add roundess to configuration" into mnc-dev

* commit '67e184862c7533d6e54337f43d197267947b9fb6':
  Add roundess to configuration

9 years agoam a74a2aff: am 90a95072: am 71645fd8: am 1629717f: Merge "Update tests per new layou...
Deepanshu Gupta [Wed, 8 Jul 2015 12:53:58 +0000 (12:53 +0000)]
am a74a2aff: am 90a95072: am 71645fd8: am 1629717f: Merge "Update tests per new layoutlib_api" into mnc-dev

* commit 'a74a2afff82b5d0cfe6aa312cf76ff9b7cfe5808':
  Update tests per new layoutlib_api

9 years agoam 5350e31d: am 08ac92be: am d327c547: am 8d6f6606: am 64e3997a: am 97dcc6fd: Docs...
David Friedman [Wed, 8 Jul 2015 12:53:51 +0000 (12:53 +0000)]
am 5350e31d: am 08ac92be: am d327c547: am 8d6f6606: am 64e3997a: am 97dcc6fd: Docs: Remaining L10N for M Preview pages (ru).

* commit '5350e31d93a37e83cccc12bde78cb4ff10a64dc4':
  Docs: Remaining L10N for M Preview pages (ru).

9 years agoam 99e2499a: am bd68b00a: am 095c55a4: am 743748b1: am baa723c2: am 14592ef0: Merge...
David Friedman [Wed, 8 Jul 2015 12:53:45 +0000 (12:53 +0000)]
am 99e2499a: am bd68b00a: am 095c55a4: am 743748b1: am baa723c2: am 14592ef0: Merge "Docs: L10N for remaining M Preview docs (pt-br)." into mnc-preview-docs

* commit '99e2499a28ac3fad75609a0097322db88b7825b7':
  Docs: L10N for remaining M Preview docs (pt-br).

9 years agoam f3c0cdb5: am 43a57790: am 741a9b1e: am 4ff73b4a: am 1937867b: am 858ef9ab: Docs...
David Friedman [Wed, 8 Jul 2015 12:53:39 +0000 (12:53 +0000)]
am f3c0cdb5: am 43a57790: am 741a9b1e: am 4ff73b4a: am 1937867b: am 858ef9ab: Docs: L10N of the remaining M-preview pages (es-la)

* commit 'f3c0cdb58b10249657305396c56d9ba9a1ced4a6':
  Docs: L10N of the remaining M-preview pages (es-la)

9 years agoam 00fe78c7: am 1a4e32dd: am acd7eb98: am 68c22cd1: am 73fde03a: am d6473b0f: Merge...
David Friedman [Wed, 8 Jul 2015 12:53:32 +0000 (12:53 +0000)]
am 00fe78c7: am 1a4e32dd: am acd7eb98: am 68c22cd1: am 73fde03a: am d6473b0f: Merge "Docs: L10N of remaining M-Preview docs (zh-tw)" into mnc-preview-docs

* commit '00fe78c7f73f4ad460f31f761e4980055acf5fca':
  Docs: L10N of remaining M-Preview docs (zh-tw)

9 years agoam e379f91a: am 07fd81b8: am 213083c8: am e6e821d6: am 3c6c05fc: am 4e1d42f9: Merge...
David Friedman [Wed, 8 Jul 2015 12:53:24 +0000 (12:53 +0000)]
am e379f91a: am 07fd81b8: am 213083c8: am e6e821d6: am 3c6c05fc: am 4e1d42f9: Merge "Docs: L10N of remaining M Preview pages for zh-cn" into mnc-preview-docs

* commit 'e379f91aded3e9831c4a0a98f8f8077b3e4b0fb7':
  Docs: L10N of remaining M Preview pages for zh-cn

9 years agoam e62c69ee: am 7fc77e60: am d453d7e4: am 3e639057: Merge "Add ACCESS_IMS_CALL_SERVIC...
Etan Cohen [Wed, 8 Jul 2015 12:53:19 +0000 (12:53 +0000)]
am e62c69ee: am 7fc77e60: am d453d7e4: am 3e639057: Merge "Add ACCESS_IMS_CALL_SERVICE hidden permission." into mnc-dev

* commit 'e62c69eea34c5ea043a8ee5bc3d8dbb0c227d511':
  Add ACCESS_IMS_CALL_SERVICE hidden permission.