Commit Graph

39128 Commits

Author SHA1 Message Date
Nicolas Prevot
4d4920ad81 Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-dev 2014-07-24 15:36:05 +00:00
Nicolas Prevot
90af6d7365 Fixing a NullPointerException in isProfileOwnerApp.
Fixing a NullPointerException in isProfileOwnerApp of DevicePolicyManager
if there is no profile owner.

BUG: 16673376
Change-Id: I912fcd38343d3c1893313e6335802d26014a2e9d
2014-07-30 15:02:57 +01:00
Christoph Studer
dda48f1221 NoListener: Optimize RankingMap
Cache ranks and interception bits instead of re-calculating
them every time they're accessed.

Change-Id: I2c6bbeaa01648d03ff8b3690b7f21cef4e2b9d97
2014-07-30 13:48:04 +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
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
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
48b3fe6f12 Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 2014-07-29 21:36:00 +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
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
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
Wei Wang
64d2b567c3 Merge "Make scan filter accepts prefix. Add tests." into lmp-dev 2014-07-25 23:01:28 +00: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
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
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
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
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
George Mount
964c3cf5b2 Add default propagation back to Explode.
Bug 16217557

Change-Id: I47460db128749af978077755a777068392492aee
2014-07-29 14:13:00 +00: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
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
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
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
Adrian Roos
489d2dfc29 Fix checkbuild
Change-Id: I9c3de31af792863b93a29ef81b50e2149b0a2184
2014-07-29 20:30:50 +00:00
Alan Viverette
4d193bdbe7 Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 2014-07-28 22:45:16 +00:00
Alan Viverette
60727e07c6 Clean up TimePicker and DatePicker styling
Removes the time and date picker specific themes and defaults their
theme attributes to use the alert dialog theme attribute's value.

BUG: 14973897
Change-Id: Id5cc74ea0c1a379fc1ee76b354a1bb5ba329585a
2014-07-29 12:49:50 -07:00
Dake Gu
09d9c3be8a Transition: Don't suppressLayout(false) for returning activity
Change-Id: I7be8a779ab8996809b36baa107acd55ab872580c
2014-07-29 11:34:35 -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