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

199073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
0e3bf65f10 Import translations. DO NOT MERGE 
Change-Id: I97c12449ee917439d8af4dcb9733cd85b1e9b62f
Auto-generated-cl: translation import
 2015-06-08 07:35:21 -05:00
Jae Seo
6868787136 am 1a2519f7: am d0c34cba: am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 
* commit '1a2519f791d7493e5ca0c2c17a42b91569a7faf7':
  MediaController: Keep the controller when touch exploration is enabled
 2015-06-06 17:05:48 +00:00
Jeff Brown
3fcdfed979 am faa4a6b0: am 95fe4e20: am c203e61d: Merge "Fix Bitmap parceling through ashmem." into mnc-dev 
* commit 'faa4a6b0bfc85b8d6e96264ac84aca7d68261571':
  Fix Bitmap parceling through ashmem.
 2015-06-06 17:05:41 +00:00
Adam Skory
8504484452 am faf041da: am 3f6bf4b2: am e76e7014: Don\'t forget to parcel mIsAppProvidedIntent 
* commit 'faf041da2638d76bc1f42492017295238bf74019':
  Don't forget to parcel mIsAppProvidedIntent
 2015-06-06 17:05:13 +00:00
Adam Skory
cd9bfda5aa am 8e7f05c8: am e1015188: am a28863e7: Merge "Record provision of custom Intents in AssistContent" into mnc-dev 
* commit '8e7f05c86e313310f29439155c73e1a557ba0080':
  Record provision of custom Intents in AssistContent
 2015-06-06 17:05:05 +00:00
Eino-Ville Talvala
8bf7dfad4d am e6ddbc77: am ce491ee1: am 76233f06: Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 
* commit 'e6ddbc7728f7d7b27a27a2ebd10b6dfe6c1ec83f':
  Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED
 2015-06-06 17:04:55 +00:00
Alan Viverette
6960c4284b am 3a1de61c: am 27b4233b: am 371b582c: Merge "Implement getColorFilter() on VectorDrawable" into mnc-dev 
* commit '3a1de61c13defdb28ffd2bd3fac79d136ce7f7fe':
  Implement getColorFilter() on VectorDrawable
 2015-06-06 17:04:43 +00:00
Wei Wang
8c8f7e5de3 am cc7d36a2: am 8864ee53: am dd99df0d: Merge "Fail sanity check when BSSID is empty in RTT request" into mnc-dev 
* commit 'cc7d36a271ce5d2d7fc15b31712a50d3320f1f01':
  Fail sanity check when BSSID is empty in RTT request
 2015-06-06 17:04:36 +00:00
Jae Seo
1a2519f791 am d0c34cba: am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 
* commit 'd0c34cbaa09921235b30dad595d501c6d4c60f2c':
  MediaController: Keep the controller when touch exploration is enabled
 2015-06-06 05:29:08 +00:00
Jae Seo
d0c34cbaa0 am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 
* commit '683e3cfef17bb1a80d7c387200ac491e663d5af2':
  MediaController: Keep the controller when touch exploration is enabled
 2015-06-06 05:16:59 +00:00
Jae Seo
683e3cfef1 Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 2015-06-06 05:06:07 +00:00
Jeff Brown
faa4a6b0bf am 95fe4e20: am c203e61d: Merge "Fix Bitmap parceling through ashmem." into mnc-dev 
* commit '95fe4e20604a4a38651841b451e41705e2571054':
  Fix Bitmap parceling through ashmem.
 2015-06-06 04:48:01 +00:00
Jeff Brown
95fe4e2060 am c203e61d: Merge "Fix Bitmap parceling through ashmem." into mnc-dev 
* commit 'c203e61d60b58f96c1f82f8f1534cce13e3f574e':
  Fix Bitmap parceling through ashmem.
 2015-06-06 04:35:19 +00:00
Jeff Brown
c203e61d60 Merge "Fix Bitmap parceling through ashmem." into mnc-dev 2015-06-06 04:28:02 +00:00
Jeff Brown
a316c5dfbc Fix Bitmap parceling through ashmem. 
Fixes a bug where the Bitmap parceling code was unable to deal with
sending bitmaps through Parcels that disallow file descriptors.
Uses extended functionality of the Parcel blob interface to pass
buffers around more efficiently while adapting to whether FDs
are allowed.

Bug: 21428802
Change-Id: If24926f4388d29aa2aac627000436beb015edcb9
 2015-06-06 04:23:45 +00:00
Adam Skory
faf041da26 am 3f6bf4b2: am e76e7014: Don\'t forget to parcel mIsAppProvidedIntent 
* commit '3f6bf4b287052f3fface43dd0377bcfada087de6':
  Don't forget to parcel mIsAppProvidedIntent
 2015-06-06 01:33:09 +00:00
Adam Skory
3f6bf4b287 am e76e7014: Don\'t forget to parcel mIsAppProvidedIntent 
* commit 'e76e7014c7aa22f56f1b82c87d9d80106b5ddcc1':
  Don't forget to parcel mIsAppProvidedIntent
 2015-06-06 01:20:19 +00:00
Adam Skory
8e7f05c86e am e1015188: am a28863e7: Merge "Record provision of custom Intents in AssistContent" into mnc-dev 
* commit 'e10151882a255a13fc6b02123db891cae7d65143':
  Record provision of custom Intents in AssistContent
 2015-06-06 01:20:15 +00:00
Adam Skory
e10151882a am a28863e7: Merge "Record provision of custom Intents in AssistContent" into mnc-dev 
* commit 'a28863e76979a3551509d8e5eccf3a1c7c604022':
  Record provision of custom Intents in AssistContent
 2015-06-06 01:08:04 +00:00
Adam Skory
e76e7014c7 Don't forget to parcel mIsAppProvidedIntent 
If you forget to parcel it like I did, it's
not going to do you much good.

Change-Id: I85191594e7ffab2c36aeed317932b126da288bdf
 2015-06-05 19:08:01 -06:00
Eino-Ville Talvala
e6ddbc7728 am ce491ee1: am 76233f06: Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 
* commit 'ce491ee170e889aeb0b3c0342b86a9c586afd62c':
  Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED
 2015-06-06 01:01:16 +00:00
Adam Skory
a28863e769 Merge "Record provision of custom Intents in AssistContent" into mnc-dev 2015-06-06 01:01:00 +00:00
Adam Skory
cd70c64f50 Record provision of custom Intents in AssistContent 
Simplifies behavior wrt automatically setting the
web URI for ACTION_VIEW Intents, by not doing so
for custom Intents.

Adds a boolean isAppProvidedIntent() as a signal for
recepients of the AssistContent that a custom Intent
was provided. Custom Intents are more likely to be
relevant.

Change-Id: Ibe4bfa040eba904411b9820ab4ddfcf509413829
 2015-06-05 18:55:29 -06:00
Eino-Ville Talvala
ce491ee170 am 76233f06: Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 
* commit '76233f068bde3c19d1d0986efee4fb21df973ed5':
  Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED
 2015-06-06 00:48:57 +00:00
Heidi von Markham
0ad013020d am 68d29e22: am 92e89dc8: am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev 
* commit '68d29e2215eefe6dbf59b16ca49dfafd9a9e83c7':
  Camera2: add missing HFR implementation
 2015-06-06 00:46:00 +00:00
Joe Fernandez
a310f88e47 am a08a143e: am 606e65a8: am c37d84ac: am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit 'a08a143ea4b02d410455a9440d038db644c5f72d':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-06 00:45:54 +00:00
Justin Harrison
c70b4364a5 am 94d5ade9: am 705a35de: am c3b9156e: am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '94d5ade9ea645914e22bb356ddcaeb814bf02596':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-06 00:45:47 +00:00
Justin Harrison
1fbd65e45e am 01c37505: am 00fd82c3: am 9445df6f: am 95be178d: am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit '01c3750504834929eed709d917d7220ba50673e8':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-06 00:45:40 +00:00
Rich Slogar
840b3d8ca0 am f60c1d3a: am ad7fc997: am 3a2a3104: am 34bebb04: am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit 'f60c1d3a49d012afb69b981f0531f6fd5b1b92b5':
  docs: studio 1.2.2.0 updates
 2015-06-06 00:45:34 +00:00
Luan Nguyen
124259e289 am 6f2c3081: am 2c11981c: am 1877a32f: am 26c3dd5b: am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit '6f2c3081b48e28b72fd6faa4912c77a1f3f69ff4':
  docs: Add DevByte embedded video.
 2015-06-06 00:45:28 +00:00
Ruben Brunk
790e1cc3c6 am 4335fbfe: am 533514c9: am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit '4335fbfe173083bc1be3989beeac74fc02deef37':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:45:22 +00:00
Alan Viverette
3a1de61c13 am 27b4233b: am 371b582c: Merge "Implement getColorFilter() on VectorDrawable" into mnc-dev 
* commit '27b4233bdeacc0f2f7d87eca27688bfb687a621e':
  Implement getColorFilter() on VectorDrawable
 2015-06-06 00:42:18 +00:00
Wei Wang
cc7d36a271 am 8864ee53: am dd99df0d: Merge "Fail sanity check when BSSID is empty in RTT request" into mnc-dev 
* commit '8864ee53201735a00351bc67693b3d9369d82cb3':
  Fail sanity check when BSSID is empty in RTT request
 2015-06-06 00:42:12 +00:00
Eino-Ville Talvala
76233f068b Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 2015-06-06 00:40:16 +00:00
Alan Viverette
27b4233bde am 371b582c: Merge "Implement getColorFilter() on VectorDrawable" into mnc-dev 
* commit '371b582c4941a7c4a1a5531fa8768db74354b616':
  Implement getColorFilter() on VectorDrawable
 2015-06-06 00:30:40 +00:00
Wei Wang
8864ee5320 am dd99df0d: Merge "Fail sanity check when BSSID is empty in RTT request" into mnc-dev 
* commit 'dd99df0dbe21b73f437de1beb910b8ef7a2b6f30':
  Fail sanity check when BSSID is empty in RTT request
 2015-06-06 00:30:36 +00:00
Heidi von Markham
68d29e2215 am 92e89dc8: am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev 
* commit '92e89dc85e2b9c649c221f97efcdee7cdfc4f76b':
  Camera2: add missing HFR implementation
 2015-06-06 00:30:20 +00:00
Joe Fernandez
a08a143ea4 am 606e65a8: am c37d84ac: am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs 
* commit '606e65a87db3ed16f7f6a43bf68971a27710f9f8':
  Revert "docs: studio 1.2.2.0 updates"
 2015-06-06 00:30:15 +00:00
Justin Harrison
94d5ade9ea am 705a35de: am c3b9156e: am 6715ef75: am 4f2927d2: am 0eeb3bb8: am 33aa55b1: am 127d0b80: Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev 
* commit '705a35de3adcd3406687bad66d4bd45f3a6725f8':
  Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""
 2015-06-06 00:30:10 +00:00
Justin Harrison
01c3750504 am 00fd82c3: am 9445df6f: am 95be178d: am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev 
* commit '00fd82c3f773f6e18605daf8f00b62e996e41588':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
 2015-06-06 00:30:04 +00:00
Rich Slogar
f60c1d3a49 am ad7fc997: am 3a2a3104: am 34bebb04: am 16293cf5: Merge "docs: studio 1.2.2.0 updates" into mnc-preview-docs 
* commit 'ad7fc99774be7bab9e10c6858ad54d0767814935':
  docs: studio 1.2.2.0 updates
 2015-06-06 00:29:59 +00:00
Luan Nguyen
6f2c3081b4 am 2c11981c: am 1877a32f: am 26c3dd5b: am ef7458ed: Merge "docs: Add DevByte embedded video." into mnc-preview-docs 
* commit '2c11981cae52e1e377084e3bc5150bdc83da0345':
  docs: Add DevByte embedded video.
 2015-06-06 00:29:55 +00:00
Ruben Brunk
4335fbfe17 am 533514c9: am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit '533514c9b5bf05bbba33e2499618fa3c47f31451':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:29:50 +00:00
Elliott Hughes
f2ac58bc6d am bdbd41c4: am 2f61e6ef: am 3a5c054a: Merge "Fix debugging-log documentation errors." 
* commit 'bdbd41c4a0f499948d0b70ff0bda311714d8d4a3':
  Fix debugging-log documentation errors.
 2015-06-06 00:29:05 +00:00
Svetoslav
8740adf017 am b594132a: am 1edaf1bc: am 772ca6cf: Merge "Update SMS permission description string" into mnc-dev 
* commit 'b594132acbf785e04ee2ce4de6cf9d3f2d590761':
  Update SMS permission description string
 2015-06-06 00:29:00 +00:00
Christopher Tate
dd7e372414 am 5cd3a088: am 8462211c: am 97c699e2: Merge "Don\'t run backups in battery-saver mode" into mnc-dev 
* commit '5cd3a088400f4adc2b6d61838563061ac94c6d80':
  Don't run backups in battery-saver mode
 2015-06-06 00:28:53 +00:00
James Cook
da591cc0fe am 80a250a3: am 715c502b: am 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev 
* commit '80a250a3c8f3a0851e7aac0929b8c0a0aa382657':
  Allow different visual and voice assist prompts
 2015-06-06 00:28:48 +00:00
Sanket Padawe
0874fb7e3e am 72515702: am 447cef97: am 912f705f: Merge "Suppress default logging in SubscriptionManager." into mnc-dev 
* commit '72515702b5ed5e519f39252c7bbbac554a506253':
  Suppress default logging in SubscriptionManager.
 2015-06-06 00:28:42 +00:00
Jae Seo
63d37d9f16 MediaController: Keep the controller when touch exploration is enabled 
Also added missing final and @Override keywords

Bug: 17199815
Change-Id: If96554e36799557a2d81767f287aeb446e4a1983
 2015-06-05 17:27:30 -07:00
Alan Viverette
371b582c49 Merge "Implement getColorFilter() on VectorDrawable" into mnc-dev 2015-06-06 00:26:04 +00:00