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

146585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcin Kosiba
eed396f792 Make webview text encoding and keySystemUUID mapping and error page public. 
These resources will need to be accessed from the APK-bundled
WebView and therefore need to be made public.

BUG: 11505352
Change-Id: I5e988671cc8342ed4146a90b4de1246460232050
 2014-07-29 15:17:07 +01:00
Jeff Davidson
1561fd3b06 Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev 2014-07-24 16:56:49 +00:00
Jeff Davidson
26fd143326 Add NetworkScoreManager.disableScoring(). 
Allows the active scorer app to disable itself.

Change-Id: I7bcdc3aafb95af4ea0b110b01b08ab4daf7a137f
 2014-07-29 16:03:19 -07:00
Jinsuk Kim
43c23e273e Invoke input change listener at path change 
Previously input change listener is not invoked if the routing change
does not cause the TV port change, but this failed to trigger the change
from an active source connected to port 1 to a non-cec device also
connected to port 1. Do this by comparing paths not ports.

Also did some cleanup:
- Avoid allocating empty lists too often for getActions
- ActiveSource.invalidate()

Change-Id: Id79531e2552ef7fa38bd604796108b8650db69a1
 2014-07-29 22:57:52 +00:00
Yuncheol Heo
26ba7fddca Make it pass CECT 11.1.3 System standby 
- Accept the broadcast <Standby> message.
- Fix the bug that onStandyCompleted() is called mutliple times.
- Fix the issue that <Standby> message is not sent when going to
  the standby state, since the local device was cleared already.

Bug: 16497304
Change-Id: Ib04ad2386621929814a801edd6b6c0e1a3902a7c
 2014-07-30 07:55:39 +09:00
Lorenzo Colitti
c6acfa29d5 Merge "Use getBoundURL for network validation." into lmp-dev 2014-07-24 16:04:26 +00:00
George Mount
964c3cf5b2 Add default propagation back to Explode. 
Bug 16217557

Change-Id: I47460db128749af978077755a777068392492aee
 2014-07-29 14:13:00 +00:00
Lorenzo Colitti
ae6dffb697 Use getBoundURL for network validation. 
Disable for now, until we're more confident that it doesn't choke
on strange captive portals.

Change-Id: Ic8e66a379d32c915c949df70ca0d38535cd5dbe0
 2014-07-29 13:36:10 +09:00
Jim Miller
73f1856f7f Merge "Add new DevicePolicyManager API to allow fine-grained TrustAgent management" into lmp-dev 2014-07-25 21:16:23 +00:00
Jim Miller
604e7558ef Add new DevicePolicyManager API to allow fine-grained TrustAgent management 
This adds a new feature that allows a device admin to specify a
whitelist of features that are allowed for the given admin.

Change-Id: I83f853318efbcf72308532d0a997374f73fa9c10
 2014-07-28 21:32:01 -07:00
John Spurlock
3af1afb069 Merge "Settings: Constants for notification settings." into lmp-dev 2014-07-27 22:35:46 +00:00
Sailesh Nepal
4e7ec71e64 Handle synchronous failed connection 
Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
 2014-07-29 01:46:57 +00:00
Filip Gruszczynski
0fa59b898a am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit '896a82d77e732c7387b2279bcdd0f04d696b13df':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:08:09 +00:00
Craig Mautner
7544c82997 am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '09875ec7292b19e07c38b6127406d6aa7490e26c':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:07:59 +00:00
John Spurlock
2b0e09c59f Settings: Constants for notification settings. 
Bug:16208321
Change-Id: Iaf18dfc2edda9d80553f02ea0a74236230f89079
 2014-07-28 20:43:47 -04:00
John Spurlock
8c01d88208 Zen: follow independent ringer mode changes. 
Bug:16624498
Change-Id: Ib623118970a82c8406c714687b1b516378fe7824
 2014-07-28 20:39:17 -04:00
vandwalle
0ae4e5da22 Merge "fix typo in scanresult" into lmp-dev 2014-07-25 21:16:23 +00:00
vandwalle
ec5a901ea8 fix typo in scanresult 
Change-Id: I4a7998097419bebeb94b23785567865b19205642
 2014-07-28 20:48:33 -07:00
vandwalle
9dddb46f0f Merge "add debug info to wificonfiguration dump" into lmp-dev 2014-07-25 21:16:23 +00:00
vandwalle
16a40cc7b5 add debug info to wificonfiguration dump 
Change-Id: I4887afa21d6e1d9463fa4a5cd0aa7ae22973239f
 2014-07-28 20:35:44 -07:00
John Spurlock
f221b7f45a Merge "Zen: Classify notifications using the alarm stream." into lmp-dev 2014-07-27 22:35:46 +00:00
John Spurlock
bfa5dc4c6c Zen: Classify notifications using the alarm stream. 
Also:
 - include audio attributes in dump
 - workaround for recent AudioAttributes change.

Bug:16455021
Change-Id: Ib9b047a74cff3e0cc354a5aaa96bc92a400b3845
 2014-07-28 23:34:31 -04:00
Sailesh Nepal
ed28d406ee Merge "Fix WTF when creating a lazily initialized connection" into lmp-dev 2014-07-24 16:56:49 +00:00
Sailesh Nepal
b2d41f4c4c Fix WTF when creating a lazily initialized connection 
Change-Id: I16af7e99d07f83b17f111acbf0a3285d09cee13e
 2014-07-28 20:33:07 -07:00
Riley Andrews
4789e41a9f Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation." into lmp-dev 2014-07-24 15:37:54 +00:00
Riley Andrews
68eccdade2 Add cursor flags into SpriteController to suppor async cursor updates. 
- This is fairly blindly taken from nvidia's implementation.

Change-Id: I825ecbd9cb4b394793dce079591b37efca546bbe
 2014-07-28 22:04:06 +00:00
Jing Zhao
03cab4cbe6 Enable config CDMA home system by mcc mnc 
Define CDMA home system IDs for Verizon

Change-Id: Ie10d838173df3095238c50d419bd9de589e34e55
 2014-07-28 21:53:52 +00:00
Winson Chung
b1b191ad66 Merge "Updating lock-to-app look." into lmp-dev 2014-07-25 21:16:23 +00:00
Winson Chung
2915b9d148 Updating lock-to-app look. 
- Adding seek bars for tweaking values when in debug mode

Change-Id: I92ae7b431ee170f5d8b31f34349d51a6b7f9ddef
 2014-07-28 22:26:36 +00:00
Eric Laurent
62dc1768d6 rename AudioSystem::newAudioSessionId() 
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.

Bug: 12378680.

Change-Id: I3f6658db2b8db8f56d1a99f12b15429e293631e6
 2014-07-28 22:21:46 +00:00
Christopher Tate
7f25081a4d Merge "Provide outside-facing API for data management intent+label" into lmp-dev 2014-07-27 22:35:46 +00:00
Christopher Tate
c17739d112 Provide outside-facing API for data management intent+label 
Bug 16346320

Change-Id: I3f4c2f4b700c77880ba3d8db7c92cdb404763d0d
 2014-07-28 23:13:06 +00:00
Jinsuk Kim
cfcdf12701 Merge "Add MHL getPortInfo" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
f4eb72d53b Add MHL getPortInfo 
Allows MHL support flag to be put into port information

Bug: 16215362
Change-Id: I1873c8e60b02f47a97509576fc40d57efb056817
 2014-07-28 06:57:04 +09:00
Jinsuk Kim
8c688ada2d MHL controller for subcommand reception 
Implement HdmiMhlController command reception part.

Bug: 16215362

Change-Id: Iabf46dfaa762fae8c537e4d4ebd3469388a6b7c3
 2014-07-26 08:14:08 +09:00
Michael Wright
5438e4e173 Add missing documentation for createVirtualDisplay 
Fix incorrect access modifier in Activity documentation.

Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
 2014-07-25 23:01:32 +00:00
Ruben Brunk
971251f362 camera2: Update preview counter after request completed. 
Bug: 15116722

- This was causing the preview counter to double decrement
  for requests where the jpeg callback was executed first.

Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
 2014-07-25 22:53:32 +00:00
Winson Chung
c37e129539 Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540) 2014-07-25 22:47:33 +00:00
Baligh Uddin
95c58ed763 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 15:37:54 +00:00
Baligh Uddin
c9c3a9c9db Import translations. DO NOT MERGE 
Change-Id: I0495a69db49b3475537a3546bcb4d246b4dd018b
Auto-generated-cl: translation import
 2014-07-28 23:12:12 +00:00
Jon Miranda
0615026ba1 Merge "Exposed getLocationOnScreen, added formatToHexString method." into lmp-dev 2014-07-24 15:36:21 +00:00
Michael Wright
9469cdde2c Add paragraph tags to MediaProjection docs 
Change-Id: Ia881f9bcf3b93bd699f9ddf80d51ec7d0e74d2ed
 2014-07-29 20:46:40 +00:00
Jon Miranda
4597e98069 Exposed getLocationOnScreen, added formatToHexString method. 
In order to use the ExportedProperty annotation, I needed a public non-void
method which is why I created a new "public int[] getLocationOnScreen()."

The formatToHexString method is used to convert an int or byte to a hex string
prefixed with "0x". I set the value to true on these flags: mGravity,
mPrivateFlags, mSystemUiVisibility, mViewFlags, mGroupFlags, mMarginFlags,
and flags.

Change-Id: I5914992ba19b80643dfcc6caa487398452e18cbc
 2014-07-29 07:25:49 -07:00
Sandeep Siddhartha
f024d30b88 Merge "Use keyphrase id from the recognition event" into lmp-dev 2014-07-24 15:37:54 +00:00
Sandeep Siddhartha
2e14dd46e1 Use keyphrase id from the recognition event 
Bug: 16516658
Change-Id: I8be773eec39e1c4c57d106e03a443cbfc5c6dc5d
 2014-07-29 13:37:34 -07:00
Alan Viverette
57b69dd27e Merge "Partial revert "Add better errors for unresolved attributes, remove unused code"" into lmp-dev 2014-07-28 18:28:56 +00:00
Alan Viverette
500c56089f Partial revert "Add better errors for unresolved attributes, remove unused code" 
This reverts commit 0e42f4b98752b6457b04887e2a557fa007da73d7.

Change-Id: Ic3f0cb709c7aaa0a9892d728311886714ba73f22
 2014-07-29 11:30:35 -07:00
Sandeep Siddhartha
6817337118 Read the keyphrase ID from the recognition event 
Bug: 16516658
Change-Id: Ibeee81c9543aa1091bb075066cfc2269107f13c0
 2014-07-29 11:24:51 -07:00
Matthew Williams
94703148bc Merge "remove possible JobScheduler race in cancel()" into lmp-dev 2014-07-28 22:45:16 +00:00
Jean-Michel Trivi
c1601f73b9 Restore missing usage assignment in AudioAttributes 
A bad merge caused the usage field assignment in
  setLegacyStreamType() to disappear. Restore it.

Change-Id: I2c72e09a2c4a394483b8a4521b72d5edcc346e23
 2014-07-29 18:14:21 +00:00