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

197088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chien-Yu Chen
73d7cfea93 am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit 'be0a7a0d02099af42e982f8370bc81dad612e91b':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 21:01:58 +00:00
Chien-Yu Chen
be0a7a0d02 am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 
* commit '3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0':
  Camera: Enforce ZERO_SHUTTER_LAG mode
 2015-07-08 20:47:16 +00:00
Tingting Wang
eeb5b9d06e 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.
 2015-07-08 20:35:01 +00:00
Chien-Yu Chen
3bbcc46d54 Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev 2015-07-08 20:35:00 +00:00
Tingting Wang
0f4595afd0 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.
 2015-07-08 20:20:20 +00:00
Tingting Wang
4ccf69e119 Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev 2015-07-08 20:07:41 +00:00
Tingting Wang
d55b348e62 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
 2015-07-08 12:55:22 -07:00
Alex Klyubin
f2d7042854 am b5501efc: am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev 
* commit 'b5501efcddb800cdc6b41863e8c4df2c1e0012ec':
  Reject AlgorithmParameters of wrong type.
 2015-07-08 19:55:10 +00:00
Alex Klyubin
b5501efcdd am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev 
* commit 'd25093d2fd151638a108a110484e579cc1dcaf54':
  Reject AlgorithmParameters of wrong type.
 2015-07-08 19:41:07 +00:00
Alex Klyubin
d25093d2fd Merge "Reject AlgorithmParameters of wrong type." into mnc-dev 2015-07-08 19:32:32 +00:00
Etan Cohen
bd966fb069 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
 2015-07-08 19:22:05 +00:00
Selim Cinek
0d959fd4d3 am 7617f55e: am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev 
* commit '7617f55ed14a55c2e314038373ca3f85e378c62a':
  Fixed a bug where collapserunnables where dropped
 2015-07-08 19:21:59 +00:00
Etan Cohen
e35c2d2fbc 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
 2015-07-08 19:10:19 +00:00
Selim Cinek
7617f55ed1 am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev 
* commit 'a8c247e0b4e14123f85cec00500144ff28aaf6ed':
  Fixed a bug where collapserunnables where dropped
 2015-07-08 19:10:15 +00:00
Etan Cohen
3aa1b1e5ec Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev 2015-07-08 19:02:34 +00:00
Selim Cinek
a8c247e0b4 Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev 2015-07-08 18:55:34 +00:00
Chien-Yu Chen
72333917a7 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
 2015-07-08 11:55:19 -07:00
Etan Cohen
47051d8e6d Lock screen text: consider possible WFC service in APM 
Bug: 22302226
Change-Id: Icd885b45ced2b57665fbed54ec6caac36839db6c
 2015-07-08 11:38:25 -07:00
Jason Monk
066b4047f4 am 0caac8ea: am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev 
* commit '0caac8ea19f19d1051bb336e31d56370244f1589':
  Remove bang from not connected wifi
 2015-07-08 17:51:27 +00:00
Eric Laurent
dfea212b18 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
 2015-07-08 17:51:23 +00:00
Geoff Mendal
c8da7d5366 am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '3c573bc5699924f5c393043847b011669b718a67':
  Import translations. DO NOT MERGE
 2015-07-08 17:39:29 +00:00
Jason Monk
0caac8ea19 am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev 
* commit 'fede4258fa1bf880c2b88ebea3c886003662fc74':
  Remove bang from not connected wifi
 2015-07-08 17:38:57 +00:00
Eric Laurent
070df44493 am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev 
* commit 'c0344a80fdb889c2b94dcfb869edf2afc5bb60df':
  audio: add definitions for devices connected over IP
 2015-07-08 17:38:53 +00:00
Jason Monk
fede4258fa Merge "Remove bang from not connected wifi" into mnc-dev 2015-07-08 17:26:34 +00:00
Eric Laurent
c0344a80fd Merge "audio: add definitions for devices connected over IP" into mnc-dev 2015-07-08 17:24:23 +00:00
Geoff Mendal
3c573bc569 am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4f5630e51d03980e80fde93154f5a0302c8179a2':
  Import translations. DO NOT MERGE
 2015-07-08 17:00:13 +00:00
Geoff Mendal
4f5630e51d Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 16:45:22 +00:00
Geoff Mendal
8c1dfcecc3 Import translations. DO NOT MERGE 
Change-Id: I81911866f73a1274582b6c93803eebff7e0e229e
Auto-generated-cl: translation import
 2015-07-08 11:38:01 -05:00
Jason Monk
7d0e5985de Remove bang from not connected wifi 
Bug: 22281118
Change-Id: I4752c0e7378fca4a94c73083a8a394cde7d6f170
 2015-07-08 12:09:52 -04:00
John Reck
62a650715d am dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev 
* commit 'dcf8837d4902ea50f2421eecde64fe55e3d98b28':
  Restrict number of hwuiTask threads
 2015-07-08 15:51:25 +00:00
John Reck
dcf8837d49 Merge "Restrict number of hwuiTask threads" into mnc-dr-dev 2015-07-08 15:40:44 +00:00
Chris Wren
b9b021d0d8 am 4c0c6739: am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev 
* commit '4c0c6739d6b22ac84f24d53250e239f5e97b5470':
  provide a cleaner notification dump
 2015-07-08 15:14:57 +00:00
Chris Wren
4c0c6739d6 am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev 
* commit '32c4802a8ac624e0426888612533a4d649f349b9':
  provide a cleaner notification dump
 2015-07-08 14:59:51 +00:00
Chris Wren
32c4802a8a Merge "provide a cleaner notification dump" into mnc-dev 2015-07-08 14:46:32 +00:00
Geoff Mendal
6760080b5e am f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f63da31f530ad43989f4269b22552df5ba3c15f7':
  Import translations. DO NOT MERGE
 2015-07-08 14:32:50 +00:00
Geoff Mendal
1fee49529e am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1e9b3cffb910c63b568348aa6a21637ed208a087':
  Import translations. DO NOT MERGE
 2015-07-08 14:32:47 +00:00
Benjamin Franz
4b7d3b477f am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 
* commit '051762f77d5bf2c0dcbb05786ac5ae81086d596c':
  Clarify javadoc of setPermissionPolicy
 2015-07-08 14:18:28 +00:00
Geoff Mendal
5e60e7c103 am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE 
* commit 'eaaae47d8901dd59a536181e07d585fe29dc53cd':
  Import translations. DO NOT MERGE
 2015-07-08 14:18:24 +00:00
Geoff Mendal
f63da31f53 am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'db586e69afc71cbc9864849e29e77bf3b6d5ba3c':
  Import translations. DO NOT MERGE
 2015-07-08 14:18:11 +00:00
Geoff Mendal
1e9b3cffb9 am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '18d4eaf54a60caaa2ffeae810a435bfad4abb59d':
  Import translations. DO NOT MERGE
 2015-07-08 14:18:07 +00:00
Geoff Mendal
db586e69af Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 14:05:55 +00:00
Geoff Mendal
18d4eaf54a Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-08 14:04:01 +00:00
Benjamin Franz
051762f77d am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 
* commit 'c088e30fd403b9843a00cc311e460734bd111c26':
  Clarify javadoc of setPermissionPolicy
 2015-07-08 14:03:46 +00:00
Geoff Mendal
eaaae47d89 am 20ad9246: (-s ours) Import translations. DO NOT MERGE 
* commit '20ad92460bf180abb1d2a154e8ec007ca2330e6d':
  Import translations. DO NOT MERGE
 2015-07-08 14:03:42 +00:00
Benjamin Franz
c088e30fd4 Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 2015-07-08 13:59:34 +00:00
Geoff Mendal
ec135f6ac5 Import translations. DO NOT MERGE 
Change-Id: I5480292e44e527d094f57361680708eba4aef6d8
Auto-generated-cl: translation import
 2015-07-08 06:54:50 -07:00
Geoff Mendal
510cd45455 Import translations. DO NOT MERGE 
Change-Id: I5571e07743dcea7a5e3f064599480796132cc31c
Auto-generated-cl: translation import
 2015-07-08 06:48:51 -07:00
Geoff Mendal
20ad92460b Import translations. DO NOT MERGE 
Change-Id: I173b85dbcf36fdc7023137949f7bb416dabc2cf5
Auto-generated-cl: translation import
 2015-07-08 06:43:44 -07:00
Benjamin Franz
45dd6667e8 Clarify javadoc of setPermissionPolicy 
Bug: 22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
 2015-07-08 14:37:28 +01:00
Dirk Dougherty
116183ac89 am 37186001: am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs 
* commit '3718600180a3496e7570e13dfae6088b89a22e81':
  Doc change -- update trade practices link.
 2015-07-08 12:12:26 +00:00