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

201584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
7a627a16ab am c224b679: am faa5985f: am fd047570: Merge "Dismiss migration notification when wizard done." into mnc-dev 
* commit 'c224b679c8880465903fafa267719d35b256e03a':
  Dismiss migration notification when wizard done.
 2015-06-16 23:07:37 +00:00
Maxim Bogatov
a09ee4a6a6 am e6ba94ce: Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 
* commit 'e6ba94ce022a60b5225ee54cf2cc710633441d87':
  fix CTS: AccessibilityEndToEndTest failing
 2015-06-16 23:01:04 +00:00
Matthew Williams
5df4154b1b am 53e8781d: am 15ce3387: Merge "Make sync settings restore more robust" into mnc-dev 
* commit '53e8781dd7702aedd3eb1a12d61477269896b36e':
  Make sync settings restore more robust
 2015-06-16 22:54:50 +00:00
Alan Viverette
d1d1607bd1 am b0bed09a: am 469b5da8: Merge "Ensure first load for bitmap and nine-patch gets correct density" into mnc-dev 
* commit 'b0bed09a0b4295c0fe4f0e20ecefa9be4ae0cf7b':
  Ensure first load for bitmap and nine-patch gets correct density
 2015-06-16 22:54:46 +00:00
Jeff Sharkey
c224b679c8 am faa5985f: am fd047570: Merge "Dismiss migration notification when wizard done." into mnc-dev 
* commit 'faa5985f331398273ed1e90f8279b393a709d201':
  Dismiss migration notification when wizard done.
 2015-06-16 22:54:41 +00:00
Quddus Chong
52fe1eab93 am bb9c8715: am 0a0f4531: am 2ce8daac: am 83ee59d5: am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628 
* commit 'bb9c871585c9e3e7ec9803ca77217a6ad54872f7':
  docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
 2015-06-16 22:50:41 +00:00
dcashman
773f3ed1e2 am f176b3b5: am 95e1f8b2: am acc2df21: Merge "Add keyset support for ECDSA public keys." into mnc-dev 
* commit 'f176b3b5a5fccad5d16dc71642a70f90a57ebf64':
  Add keyset support for ECDSA public keys.
 2015-06-16 22:50:35 +00:00
Maxim Bogatov
e6ba94ce02 Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev 2015-06-16 22:48:59 +00:00
Matthew Williams
53e8781dd7 am 15ce3387: Merge "Make sync settings restore more robust" into mnc-dev 
* commit '15ce33873e2ca774a1fca666a05cc8ed79f327d7':
  Make sync settings restore more robust
 2015-06-16 22:42:38 +00:00
Alan Viverette
b0bed09a0b am 469b5da8: Merge "Ensure first load for bitmap and nine-patch gets correct density" into mnc-dev 
* commit '469b5da8837a7fa93fc38a16e5e590e9dc2fbdf8':
  Ensure first load for bitmap and nine-patch gets correct density
 2015-06-16 22:42:33 +00:00
Jeff Sharkey
faa5985f33 am fd047570: Merge "Dismiss migration notification when wizard done." into mnc-dev 
* commit 'fd0475702b6be5930eb8b6633ea877e06392044f':
  Dismiss migration notification when wizard done.
 2015-06-16 22:42:26 +00:00
Matthew Williams
15ce33873e Merge "Make sync settings restore more robust" into mnc-dev 2015-06-16 22:36:53 +00:00
Quddus Chong
bb9c871585 am 0a0f4531: am 2ce8daac: am 83ee59d5: am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628 
* commit '0a0f453151f9f22e1bd12b3267a95f6423f4c944':
  docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
 2015-06-16 22:36:13 +00:00
dcashman
f176b3b5a5 am 95e1f8b2: am acc2df21: Merge "Add keyset support for ECDSA public keys." into mnc-dev 
* commit '95e1f8b2362764af50c88328c30c06a5a4e89d15':
  Add keyset support for ECDSA public keys.
 2015-06-16 22:36:08 +00:00
Alan Viverette
469b5da883 Merge "Ensure first load for bitmap and nine-patch gets correct density" into mnc-dev 2015-06-16 22:33:25 +00:00
Jeff Sharkey
fd0475702b Merge "Dismiss migration notification when wizard done." into mnc-dev 2015-06-16 22:31:31 +00:00
Quddus Chong
0a0f453151 am 2ce8daac: am 83ee59d5: am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628 
* commit '2ce8daacac91f4ea8da3f8c6c08c8242a0316310':
  docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
 2015-06-16 22:22:26 +00:00
dcashman
95e1f8b236 am acc2df21: Merge "Add keyset support for ECDSA public keys." into mnc-dev 
* commit 'acc2df21de9da66d8aaf9bf2b733f8b284454403':
  Add keyset support for ECDSA public keys.
 2015-06-16 22:22:22 +00:00
Maxim Bogatov
f399af3e5f fix CTS: AccessibilityEndToEndTest failing 
ViewGroup overrides class name population to
AccessibilityEvent. So className is always ViewGroup
for any ViewGroup inherited classes

b/21369265

Change-Id: I46095c21e523e05066c7f6ee395171d4725983ac
 2015-06-16 15:19:42 -07:00
dcashman
13ae6679e1 am daccbc0a: am 1208e343: am 2f902959: Merge "Make keysetmgrservice gurantees explicit." into mnc-dev 
* commit 'daccbc0a3c34808d5818f2e754b60731c803a14c':
  Make keysetmgrservice gurantees explicit.
 2015-06-16 22:17:56 +00:00
Jinsuk Kim
bc3119332b am 57e7b95b: am 6de90983: am 52ca0207: Merge "CEC: Handle <Set Menu Language> message on playback devices" into mnc-dev 
* commit '57e7b95b044ccedb4ac0a9d09cc1da0dd5b4b290':
  CEC: Handle <Set Menu Language> message on playback devices
 2015-06-16 22:17:50 +00:00
Paul McLean
3872af07e2 am e22a8042: am 1f2e0e42: am 8ff232c7: Merge "Implement channel index masks in AudioDeviceInfo." into mnc-dev 
* commit 'e22a8042abbcce941ae82752a60c78f805db973b':
  Implement channel index masks in AudioDeviceInfo.
 2015-06-16 22:17:45 +00:00
Andrew Solovay
2f1afcfaa7 am 4d20399c: am 47003cf5: am b259a903: am c75034f1: am c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs 
* commit '4d20399cc3a73c21b7acfc98a06258f1381dbf4f':
  docs: Added new "100 days" video to AfW landing page
 2015-06-16 22:17:39 +00:00
Dianne Hackborn
012e192dfc am e9663b07: am 98d9710c: am f4c936a7: Merge "Fix to only do pre boot receivers on upgrade." into mnc-dev 
* commit 'e9663b0748445b1701bc6b1d19795a32478a1425':
  Fix to only do pre boot receivers on upgrade.
 2015-06-16 22:17:34 +00:00
Adam Powell
eee619b417 am 3d501550: am d5965799: am 8edfe18c: Merge "Fully remove Toolbar children when action views expand" into mnc-dev 
* commit '3d501550ae25564240af2a7bb777cafab19157ea':
  Fully remove Toolbar children when action views expand
 2015-06-16 22:17:28 +00:00
Adam Powell
56ee010cd8 am 93af99f2: am 749285a2: am 26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev 
* commit '93af99f21d5499b3d2100951f9238a296043b355':
  Fix crash in ToolbarActionBar when setting null custom view
 2015-06-16 22:17:23 +00:00
Quddus Chong
2ce8daacac am 83ee59d5: am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628 
* commit '83ee59d5de365669cd7a9d8bfa552a90678d0587':
  docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
 2015-06-16 22:15:15 +00:00
dcashman
acc2df21de Merge "Add keyset support for ECDSA public keys." into mnc-dev 2015-06-16 22:14:35 +00:00
Quddus Chong
83ee59d5de am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628 
* commit '375ad9e1ebc327b87f378f1e0d3cf12f058e5f36':
  docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
 2015-06-16 22:05:54 +00:00
Dan Albert
8c413428ae am 49225374: am 3a059d2d: am f35f66a8: Merge "Use new sanitizer option." 
* commit '492253742a6196e7cf86bb51c9ea63b9322a36a6':
  Use new sanitizer option.
 2015-06-16 22:05:23 +00:00
Ruben Brunk
4b2df93d2a am 88727a3c: am 8d58dcc7: am 1c52669d: Merge "Add distortion correction opcodes in DngCreator." into mnc-dev 
* commit '88727a3c874ec2006eb5eafdf8bef155bbb9d63b':
  Add distortion correction opcodes in DngCreator.
 2015-06-16 22:05:17 +00:00
Alex Klyubin
3fceec65f9 am c2416017: am 8e04473d: am e8265154: Merge "Harden KeyInfo." into mnc-dev 
* commit 'c2416017d6bf6b23751050307a924b1c8ff9ff56':
  Harden KeyInfo.
 2015-06-16 22:05:11 +00:00
Eino-Ville Talvala
0c330f24c7 am 70b68cda: am e652f928: am 57af7531: Merge "Camera: Adjust intrinsic transform coordinate system." into mnc-dev 
* commit '70b68cdac4a5c7712cba60a7c3adec3becc485cf':
  Camera: Adjust intrinsic transform coordinate system.
 2015-06-16 22:05:05 +00:00
Alex Klyubin
6e0969a258 am 1f30907e: am faffb34e: am ee0a0c6f: Merge "Harden and clean up KeyProtection." into mnc-dev 
* commit '1f30907edbd5d6b6a558be13228dc47edf8ff4cf':
  Harden and clean up KeyProtection.
 2015-06-16 22:04:59 +00:00
Alex Klyubin
2e0e748f10 am 686e1b97: am 301e99a0: am 4f131667: Merge "Harden and clean up KeyGenParameterSpec." into mnc-dev 
* commit '686e1b97aad2be441a71eafcf7608ddf91c69fb8':
  Harden and clean up KeyGenParameterSpec.
 2015-06-16 22:04:53 +00:00
Rubin Xu
d2acb164dd am befbdb00: am a4f1642b: am dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 
* commit 'befbdb00f9b3bd7edcbdd688754c9b782a4bb73c':
  Deprecate SHA-1 in ManagedProvisioning (API doc change)
 2015-06-16 22:04:48 +00:00
Alan Viverette
63a39ffe48 Ensure first load for bitmap and nine-patch gets correct density 
Remove unnecessary lines setting target density on bitmap and nine patch,
since we'll do this later in inflate().

Bug: 21774853
Change-Id: I5ea316bee81f82192ce20f2f1bee0e62c6ec8ccb
 2015-06-16 15:04:45 -07:00
Chris Wren
689332f4f3 am bf539186: am db31e283: am 3397727b: Merge "disable verbose logs from people notifications." into mnc-dev 
* commit 'bf539186cb506a9f8eafdf2c5891555d97260ee5':
  disable verbose logs from people notifications.
 2015-06-16 22:04:41 +00:00
Felipe Leme
9b1d08f52c am 46301a62: am 8234ed70: am fcb55902: Merge "Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM." into mnc-dev 
* commit '46301a62ea8e06abc6f01b74740da0f807345472':
  Improved zipping logic so it zips chunks, instead of the whole file at once, to avoid OOM.
 2015-06-16 22:04:35 +00:00
dcashman
daccbc0a3c am 1208e343: am 2f902959: Merge "Make keysetmgrservice gurantees explicit." into mnc-dev 
* commit '1208e343f1b807496a22ea34c70a3b86c3b280f8':
  Make keysetmgrservice gurantees explicit.
 2015-06-16 22:04:30 +00:00
John Reck
ba2609cc76 am f9fd28e7: am de3799ca: am f24bed80: Merge "Fix null deref" into mnc-dev 
* commit 'f9fd28e7948c245786c40d808642eaf868e94518':
  Fix null deref
 2015-06-16 22:04:29 +00:00
Jinsuk Kim
57e7b95b04 am 6de90983: am 52ca0207: Merge "CEC: Handle <Set Menu Language> message on playback devices" into mnc-dev 
* commit '6de909838e335161215a771faa7086882d36e257':
  CEC: Handle <Set Menu Language> message on playback devices
 2015-06-16 22:04:25 +00:00
Fyodor Kupolov
ea74e226ba am e8d84046: am 4c1e8ecf: am 27a88a3e: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev 
* commit 'e8d8404614dc7351eee522ec0d003ed2d096caf1':
  Additional OP_READ_PHONE_STATE AppOps checks for telephony
 2015-06-16 22:04:23 +00:00
Paul McLean
e22a8042ab am 1f2e0e42: am 8ff232c7: Merge "Implement channel index masks in AudioDeviceInfo." into mnc-dev 
* commit '1f2e0e4244485fa49d036dc54a90f08df095f428':
  Implement channel index masks in AudioDeviceInfo.
 2015-06-16 22:04:20 +00:00
Felipe Leme
4e197493bd am 1d882baf: am 0fe3f871: am a106554c: Merge "Changed BugReportReceiver to send zipped bugreports." into mnc-dev 
* commit '1d882bafc7dc855951ba980529560b48f95e4fb3':
  Changed BugReportReceiver to send zipped bugreports.
 2015-06-16 22:04:17 +00:00
Andrew Solovay
4d20399cc3 am 47003cf5: am b259a903: am c75034f1: am c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs 
* commit '47003cf50c8f454303b3c571b9e12501c3eba28d':
  docs: Added new "100 days" video to AfW landing page
 2015-06-16 22:04:16 +00:00
Dianne Hackborn
e9663b0748 am 98d9710c: am f4c936a7: Merge "Fix to only do pre boot receivers on upgrade." into mnc-dev 
* commit '98d9710cf0481f135be86be88a51920b764cc206':
  Fix to only do pre boot receivers on upgrade.
 2015-06-16 22:04:12 +00:00
Chirag Shah
e7f39c51cf am 3db44d08: am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 
* commit '3db44d08ea8fb083ec952ff647b6037bb9b2253d':
  Allow 3P apps to provide structured data within AssistContent.
 2015-06-16 22:04:11 +00:00
Adam Powell
3d501550ae am d5965799: am 8edfe18c: Merge "Fully remove Toolbar children when action views expand" into mnc-dev 
* commit 'd59657997200c1bd4eb2f9b2b034357e1d5f5efe':
  Fully remove Toolbar children when action views expand
 2015-06-16 22:04:06 +00:00
Jason Monk
af153db4c8 am 225a049d: am cb44d7d7: am ece811da: Merge "Add ic_dialog_alert_material to symbols" into mnc-dev 
* commit '225a049d7a95f9584a97d99c758a385ec50d41b5':
  Add ic_dialog_alert_material to symbols
 2015-06-16 22:04:05 +00:00