Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
147,029 Commits 3 Branches 0 Tags
21aedc86c2de28b380241ca41ab86555dc787a7f
Commit Graph

42526 Commits

Author SHA1 Message Date
Christoph Studer
21aedc86c2 am e9256065: am 3b4e3f86: am 64130a59: Notification: Forward setUser() call to publicVersion 
* commit 'e92560655358d24273e1bffb238ba675c0ea6e07':
  Notification: Forward setUser() call to publicVersion
 2014-07-30 16:53:38 +00:00
Adrian Roos
0137fad85c am a31c657f: am b0ccee55: am a8ef647d: Trust: Make setEnabledFeatures asynchronous 
* commit 'a31c657fa680a46579e10f1e117497a276c74ebe':
  Trust: Make setEnabledFeatures asynchronous
 2014-07-30 16:53:34 +00:00
Adrian Roos
dd1c74b4e7 am ced134ad: am f4f27378: am 33d3756f: Add setManagingTrust and expose it on lockscreen 
* commit 'ced134adf760e328d8459cfb38d1844868e4659f':
  Add setManagingTrust and expose it on lockscreen
 2014-07-30 16:53:30 +00:00
Torne (Richard Coles)
e5482772b1 am 8f685531: am 59c0eac1: am 1acbe9ad: Merge "Parse system properties that are lists correctly." into lmp-dev 
* commit '8f6855315d019823eeb9fa5f964d5e582323e4ce':
  Parse system properties that are lists correctly.
 2014-07-30 16:53:23 +00:00
Sander Alewijnse
c9bc1f46ad am bc5659b9: am 003c6acc: am bbafde69: Add warning in the disambig for specific launchers. 
* commit 'bc5659b92e3648fa2b08f72a8363f5b7acc936bc':
  Add warning in the disambig for specific launchers.
 2014-07-30 16:53:14 +00:00
Jae Seo
9e96af9848 am a6377bb1: am 4c61c0a4: am ec7accc2: TIF: Merge TvParentalControlManager into TvInputManager 
* commit 'a6377bb178192f54a761325ff951a59cacd1d6e6':
  TIF: Merge TvParentalControlManager into TvInputManager
 2014-07-30 16:53:00 +00:00
Alan Viverette
a55f4aff7f am 8f0bfde0: am 81250206: am 719cc772: Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev 
* commit '8f0bfde085a7b8c9189707f597719d162da20ad6':
  Revert "Update switch assets, fix SearchView asset 9-patch areas"
 2014-07-30 16:52:51 +00:00
Alan Viverette
353d323321 am 5b3a2b4c: am b1d563b1: am cabeac83: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit '5b3a2b4c03bb88f28260dadd76776b27d0976e42':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 16:52:40 +00:00
Aravind Akella
bb9e3ee435 am 8b9de74e: am 05f855b4: am 1fde001f: Merge "SensorManager API changes." into lmp-dev 
* commit '8b9de74e2bd522c5f97c64f7c085bfc0f8508053':
  SensorManager API changes.
 2014-07-30 16:52:31 +00:00
Alan Viverette
df01dd1612 am 8c027029: am d34d495f: am de583846: Merge "Enable hardware rendering for system process" into lmp-dev 
* commit '8c027029580845b730bb82887841b465bb5d7c94':
  Enable hardware rendering for system process
 2014-07-30 16:52:27 +00:00
Wei Wang
b20d3df1cc am 1136f712: am 53be8d6a: am e95a450e: Merge "Make scan filter accepts prefix. Add tests." into lmp-dev 
* commit '1136f71280f183e3c9296be4d1f0f3084bf1dad9':
  Make scan filter accepts prefix. Add tests.
 2014-07-30 16:51:59 +00:00
Amith Yamasani
e2013c5dc7 am f77c4da3: am 8d072bf2: am e257f1ee: Set profile owner via an intent 
* commit 'f77c4da31c808ac48eb4dc96c8f9283ac159e496':
  Set profile owner via an intent
 2014-07-30 16:51:54 +00:00
Jeff Davidson
b300f5ee73 am f96b5c61: am c6ddb55c: am 9f920587: Merge "Don\'t request network scores before boot completes." into lmp-dev 
* commit 'f96b5c61f7c9b80ee0cb86cf5e1688d7b401e387':
  Don't request network scores before boot completes.
 2014-07-30 16:51:50 +00:00
Amith Yamasani
331ae444de am 72735fda: am db231902: am 711c40a2: Merge "Potential fix for apps disappearing in launcher on system server crash" into lmp-dev 
* commit '72735fda91d82b8e61dbef9036a28a6890c31c09':
  Potential fix for apps disappearing in launcher on system server crash
 2014-07-30 16:51:40 +00:00
Eino-Ville Talvala
fad9cd4746 am a9545b21: am 5496085d: am c02b64b6: Camera2: API review updates 
* commit 'a9545b21509c07541a3637dcd1eb34a4c765edc2':
  Camera2: API review updates
 2014-07-30 16:51:36 +00:00
Jeff Davidson
8456f49a27 am d823f25a: am bf7b7ee0: am ebc1f37f: Merge "Add NetworkScoreManager.disableScoring()." into lmp-dev 
* commit 'd823f25a7899ab5203755424a80a605ac98ccd8e':
  Add NetworkScoreManager.disableScoring().
 2014-07-30 16:51:12 +00:00
Christoph Studer
fd19326c6b Notification: Forward setUser() call to publicVersion 
Change-Id: I82715d69664fcbf57ca0599994004a8630f8587c
 2014-07-30 13:16:57 +00:00
Adrian Roos
8f21158fe6 Trust: Make setEnabledFeatures asynchronous 
Unsynchronizes the call into app code from setEnabledFeatures,
replacing it with a callback mechanism. Also makes this actually
work by fixing the check in TrustManagerService to take into account
whitelisting.

Change-Id: I0831752cd2d3158eda9c8404a5569498f11ac2ac
 2014-07-30 12:34:18 +00:00
Adrian Roos
7861c663fd Add setManagingTrust and expose it on lockscreen 
Adds a facility for trust agents to indicate if they
are ready to manage trust. Also adds an indication to
the lock icon on the lockscreen to show whether trust is
being managed.

Bug: 15518469
Bug: 16123013

Change-Id: Ie17f588aebeafe66c81dea4a69c733b0d2c72fd4
 2014-07-30 12:33:33 +00:00
Sander Alewijnse
6c9eee8747 Add warning in the disambig for specific launchers. 
For launcher that do not support managed profiles.
Also, ignore the intent after click on those launchers.

Change-Id: I3d5691952a9409755b7cde68a3caba98a3772665
 2014-07-30 10:27:44 +00:00
Jae Seo
783645e99f TIF: Merge TvParentalControlManager into TvInputManager 
This change addresses the following API council feedback.

TvParentalControlManager:
-- Replace the listener interface with a broadcast Intent with well-known
   action, something like ACTION_BLOCKED_RATINGS_CHANGED.
-- TvParentalControlManager goes away, and two remaining methods move to
   TvInputManager.

== Implementation changes ==
-- The user-selected rating preferences should be stored in an XML file, and
   loaded at boot by your internal system service.  It should _not_ be stored in
   a Secure/Global setting.

Bug: 16542165
Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
 2014-07-30 15:39:39 +09:00
Amith Yamasani
bf3a946548 Set profile owner via an intent 
priv apps can request to become a profile owner after setup has
completed. This will pop up a consent dialog (in Settings).

Also, clean up profile owner concept to be a component name.

Change-Id: I5e8532866e8018f61836c4e84fbbadb6150218ae
 2014-07-29 23:43:32 +00:00
Eino-Ville Talvala
abd9d3c5c7 Camera2: API review updates 
- Rename CameraCharacteristics#SENSOR_INFO_TIMESTAMP_CALIBRATION
  to TIMESTAMP_SOURCE
- Remove StreamConfigurationMap#NO_MIN_FRAME_DURATION

Bug: 16402755
Change-Id: I6c30a1e931c9f064c22092d362bcc61bd88e2f8a
 2014-07-29 23:30:34 +00:00
Alan Viverette
48b3fe6f12 Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 2014-07-29 21:36:00 +00:00
Alan Viverette
8bb399069d Update switch assets, fix SearchView asset 9-patch areas 
BUG: 16606037
BUG: 16467249
Change-Id: Iabdf1634f4d8f87031ab3e5579140cdd428173de
 2014-07-30 00:28:08 +00:00
Alan Viverette
5e1565ead6 Enable hardware rendering for system process 
Also enables hardware rendering by default on windows created
without a parent activity (e.g. by services).

BUG: 16240470
Change-Id: I906d48cb07af50fa02dae4f4ecdb5e65211fc6ef
 2014-07-29 23:56:52 +00:00
Alan Viverette
9e244b93c4 Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev 2014-07-28 22:45:16 +00:00
Alan Viverette
9b38f6c2cd Revert "Update switch assets, fix SearchView asset 9-patch areas" 
Missing updated current.txt

This reverts commit dbf6b0d68a3d502430d061cd14f03f344b50f019.

Change-Id: I70846883f56be661fa89f9eaf20f5d103f2833c6
 2014-07-30 02:39:07 +00:00
Aravind Akella
6fc1901b1a Merge "SensorManager API changes." into lmp-dev 2014-07-28 22:45:16 +00:00
Aravind Akella
0288ca63e3 SensorManager API changes. 
i) Remove WAKE_UP_* sensor constants and corresponding string constants.
     ii) Add getDefaultSensor(int, boolean) API.

Bug: 16399898
Change-Id: I53cb7dec02568503ebd35983e6b0c64e9c5070d7
 2014-07-29 17:41:02 -07:00
Wei Wang
64d2b567c3 Merge "Make scan filter accepts prefix. Add tests." into lmp-dev 2014-07-25 23:01:28 +00:00
Wei Wang
0462468aaf Make scan filter accepts prefix. Add tests. 
Change-Id: I714dd6d95ad2bc874dce1106b325762b19159119
 2014-07-28 21:46:44 -07:00
Sreeram Ramachandran
f4e0c0cb8e Allow VPNs to add/remove link addresses dynamically. 
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
 2014-07-29 00:32:59 +00:00
Jeff Davidson
acb5b7f084 Merge "Don't request network scores before boot completes." into lmp-dev 2014-07-25 21:16:23 +00:00
Jeff Davidson
505c4a3093 Don't request network scores before boot completes. 
Bug: 16655123
Change-Id: If6696635c59f6494e6232c3a75d283a2cbce2798
 2014-07-29 16:18:04 -07:00
Amith Yamasani
204e80485f Merge "Potential fix for apps disappearing in launcher on system server crash" into lmp-dev 2014-07-25 21:16:23 +00:00
Amith Yamasani
ad97b8b905 Potential fix for apps disappearing in launcher on system server crash 
Throw RuntimeException to launcher if there was a RemoteException
from LauncherAppsService. This matches the behavior of previous
calls that were made to PackageManager that could have resulted
in a RemoteException if the system server was dying/dead.

Bug: 15687732
Change-Id: Ifda3fda209141b361a286fc033217acfa0ec196e
 2014-07-29 16:25:17 -07:00
Prerepa Viswanadham
f6b3d8ca36 Fix crash in Stopping/Starting BLE advertising after 
BluetoothAdapter cycling

Bug 16528460
Change-Id: Iad852bc93d307c5ca5f7e42f24248aa02c105e8a
 2014-07-29 21:06:29 +00:00
Jinsuk Kim
b2b3151a42 Send TV app the intent for the new active source 
When signalled by an external CEC device about to become a new active
source, TIF(TvInputHardwareManager) sends an intent for TV app to tune to
the input mapped to the device. For non-CEC devices or MHL device
the device info comes with port ID only, which should be used to find
the right input.

Change-Id: I71c8454fead037d880ee440b0a8d64dd361ed558
 2014-07-29 22:41:57 +00:00
Igor Murashkin
ffdfcd7f27 Merge "camera2: legacy: Don't set the @hide frame number metadata" into lmp-dev 2014-07-25 21:16:23 +00:00
Igor Murashkin
56678d8778 camera2: legacy: Don't set the @hide frame number metadata 
Change-Id: Id1c8292444a45a97228d5c95f23f6d1f8171d3b5
 2014-07-29 15:14:57 -07:00
Igor Murashkin
bdf366cc70 camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT) 
Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc
 2014-07-29 15:09:45 -07:00
Igor Murashkin
3676164462 Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 2014-07-29 21:36:00 +00:00
Igor Murashkin
3a3eb15741 camera2: legacy: fix cached results bug and fix focus modes 
- Also add request.frameCounter and request.pipelineDepth results

Change-Id: I104c8243fa525622cb4ab7b5535cbca8588862f3
 2014-07-29 14:23:27 -07:00
Igor Murashkin
83d8639e90 camera2: legacy: Add focus support 
* Characteristics will list control.availableAfModes
* Request/result for control.afMode and control.afState

(Does not yet support control.afRegions)

Change-Id: I828111425fa587114d5159f7fb2b1e53a2c74e61
 2014-07-29 14:20:41 -07:00
Igor Murashkin
3f2757a305 Merge changes I104c8243,I82811142 into lmp-dev 
* changes:
  camera2: legacy: fix cached results bug and fix focus modes
  camera2: legacy: Add focus support
 2014-07-25 21:16:23 +00:00
George Mount
7299bc1305 Merge "Allow a "ghost view" that paint a different view from the overlay." into lmp-dev 2014-07-25 21:16:23 +00:00
George Mount
807e40c55c Allow a "ghost view" that paint a different view from the overlay. 
Bug 15744995

The ghost view doesn't route touch events, but hides another
view in its normal parent, and paints it as a child of another
ViewGroup or ViewGroupOverlay.

Change-Id: I352e14c366ccfb7303cee1dbff8563c673fd12ff
 2014-07-29 07:27:52 -07: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