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

197508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mady Mellor
a54a8626ed Merge "Change stylus button press to context click in GD - API review feedback" into mnc-dev 2015-06-08 15:11:10 +00:00
Chris Wren
aaf68f2163 Merge "instrument emergency call button" into mnc-dev 2015-06-08 14:38:30 +00:00
Geoff Mendal
51ddeca824 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 14:18:58 +00:00
George Mount
7c79c82b97 Merge "Don't cause requestLayout when transition changes Visibility." into mnc-dev 2015-06-08 14:18:13 +00:00
Geoff Mendal
101ba78a80 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 14:16:53 +00:00
Geoff Mendal
29d6e8d302 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 14:15:23 +00:00
Jason Monk
eb738616c9 Merge "Add demo mode to tuner" into mnc-dev 2015-06-08 14:13:52 +00:00
Geoff Mendal
bff802b3ba Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-08 14:11:47 +00:00
Jason Monk
16ada3df30 Add demo mode to tuner 
Allows turning on/off and setting to specific mode for screen shots.

Change-Id: Iee95aff17189dea7a77c493e9b396b9f21052ee8
 2015-06-08 10:08:06 -04:00
Geoff Mendal
0926f585fd Import translations. DO NOT MERGE 
Change-Id: I63c54f533e54ee9cc140f64e1956661deb8bc7b5
Auto-generated-cl: translation import
 2015-06-08 08:53:29 -05:00
Geoff Mendal
40f26e1caa Import translations. DO NOT MERGE 
Change-Id: Ib2b21a5127e5d2c29bf60c62fa90c5e1dca3ccf1
Auto-generated-cl: translation import
 2015-06-08 08:47:53 -05:00
Jason Monk
8a3a964d0a Show Cast Tile when trusted 
Add a trusted state to the KeyguardMonitor and update uses of it
to treat trusted as if it weren't secure.

Bug: 19709691
Change-Id: Ic46818b6c27e0bd093c7c3af904388fcb870c4c4
 2015-06-08 09:46:34 -04:00
Geoff Mendal
124103fa52 Import translations. DO NOT MERGE 
Change-Id: I8592894958f93b88c36e60e0484f5a1ff6a1bc3a
Auto-generated-cl: translation import
 2015-06-08 08:45:04 -05:00
Geoff Mendal
4f460cdb46 Import translations. DO NOT MERGE 
Change-Id: I2793d7c9398a326a5ed7eccc9e0d241876cf2947
Auto-generated-cl: translation import
 2015-06-08 08:42:20 -05:00
Jason Monk
6236a820a2 Merge "Setup service for tunable things to use." into mnc-dev 2015-06-08 13:10:32 +00:00
Lorenzo Colitti
ef2ccf5f4b Merge "Correctly time out CMD_START_DHCP." into mnc-dev 2015-06-08 12:48:40 +00:00
Kenny Guy
a73e459950 Merge "Correct the docs for getUserBadgedIcon" into mnc-dev 2015-06-08 12:34:26 +00:00
Abodunrinwa Toki
7d3b8833df Merge "Fix ActionMode.snooze API" into mnc-dev 2015-06-08 11:36:19 +00:00
Lorenzo Colitti
5bc64b847a Correctly time out CMD_START_DHCP. 
WifiStateMachine expects CMD_START_DHCP to time out after 30-40
seconds. Currently, DhcpClient imposes timeouts on DhcpInitState
and on DhcpRequestState, but not on the time it takes to get to
from CMD_START_DHCP to DhcpBoundState. So in theory the client
could oscillate between DhcpInitState and DhcpRequestState and
never time out.

Fix this by introducing a new oneshot timer that is set when DHCP
starts and is cancelled when it succeeds. CMD_RENEW_DHCP does not
need this because it's implemented using only one state, so the
oneshot timeout can be implemented using the state timeout.

Bug: 19704592
Change-Id: I6a5847a3dee23a2692237b8f3b3b0f8049da5140
 2015-06-08 19:57:14 +09:00
Martijn Coenen
6280481af6 Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 2015-06-08 08:05:14 +00:00
Seigo Nonaka
dcfbb618e3 Merge "Catch BadTokenException and continue in clearInsetofPreviousIme." into mnc-dev 2015-06-08 05:36:10 +00:00
Lorenzo Colitti
dc540ea067 Merge "Delete code that checks for the simulator, it's long gone." into mnc-dev 2015-06-08 04:18:40 +00:00
Seigo Nonaka
e937216c33 Catch BadTokenException and continue in clearInsetofPreviousIme. 
This is a follow up CL for Ib04967f39b2529251e4835c42e9f99dba2cf43f2.
As well explained in the I2c21573cf972145ab08e66604cdb9344139a3f31,
the race condition here cannot be avoided without an unacceptable
performance penalty.  For now, we follow the same way.

Bug: 21600287
Change-Id: I0ffdf8bf7e8a53cf8aba1339024b32da65d4f32d
 2015-06-08 12:47:25 +09:00
Jason Monk
5e745172d9 Setup service for tunable things to use. 
Change-Id: I13daa68d3d1ec5584fd84f356f4f5a0d1c0b853a
 2015-06-07 08:44:14 -04: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
Adam Lesinski
6b0331a030 Wait for wakeup_reasons on first init 
Previously if we were initializing the wakeup callback for the first time,
we would read the wakeup_reason file and ignore the contents, sending a
wakeup_reason of "unknown" up to BatteryStats.

Now we initialize the callback and wait on it immediately. Wakeup reasons are reset
when we go into sleep, so when we wakeup, we will always have fresh wakeup reasons.

Bug:21665793

Change-Id: I20832d8a143fc2715915fcecf4bb71980f279440
 2015-06-05 17:47:07 -07: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