OSDN Git Service
Dake Gu [Tue, 12 Aug 2014 23:51:22 +0000 (23:51 +0000)]
Merge "fix ghost clipBounds problem" into lmp-dev
Winson Chung [Tue, 12 Aug 2014 23:51:14 +0000 (23:51 +0000)]
Merge "Implementing Recents focus states. (Bug
16950262)" into lmp-dev
Tenghui Zhu [Tue, 12 Aug 2014 23:41:42 +0000 (23:41 +0000)]
Revert "Update attrs / public.xml for VectorDrawable opacity removal"
This reverts commit
9c44a95d5168c219facb39e7cca275d1e0a02cee.
Change-Id: If328d3101ce44c63d643217218109bb82e4f20ae
Winson Chung [Tue, 12 Aug 2014 02:25:42 +0000 (19:25 -0700)]
Implementing Recents focus states. (Bug
16950262)
- Fixed issue with focus going to send front most task when coming from Home
- Adding shortcut to dismiss a task
- Refactoring code to get secondary overlay and affiliation color
- Throttling alt-tab key presses
- Fixing issue with slivers of the task thumbnail being visible for affiliated tasks
Change-Id: Iaafe408318646a423fd58b51bbe93dbe0f2eed99
Dake Gu [Tue, 12 Aug 2014 21:54:53 +0000 (14:54 -0700)]
fix ghost clipBounds problem
OverlayViewGroup clipChildren=true, so that RenderNode
of GhostView will be forced clip its content to its bounds.
Because GhostView is transformed to a different location
other than (0,0), the content left/up to the bounds
is clipped out.
Introduce another clipChildren=false view between
OverlayViewGroup and GhostView.
b/
16982904
Change-Id: Ia11926c78e19bffe80c3d4584a59b83b2fbee6df
David Christie [Tue, 12 Aug 2014 22:22:27 +0000 (15:22 -0700)]
Disable GPS when battery saver is on and screen is off.
Bug:
15348895
Change-Id: Iae2c3898ff48dc4d22e0ff872d7417ef6945c5e3
Ruben Brunk [Tue, 12 Aug 2014 18:09:01 +0000 (11:09 -0700)]
DNG: Fix row stride check.
Bug:
16986715
Change-Id: I5337194f7078d394b9e972e81861794283925612
Quddus Chong [Tue, 12 Aug 2014 22:52:08 +0000 (22:52 +0000)]
am
eb4d136e: am
a5365ed9: am
ac605c84: Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs
* commit '
eb4d136e5a8833a7071b797ab6e6e455ae85b063':
docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support.
Quddus Chong [Tue, 12 Aug 2014 22:46:41 +0000 (22:46 +0000)]
am
a5365ed9: am
ac605c84: Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs
* commit '
a5365ed9dd080529609078c0b262e775ba3b460e':
docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support.
Quddus Chong [Tue, 12 Aug 2014 22:42:19 +0000 (22:42 +0000)]
am
ac605c84: Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs
* commit '
ac605c8488a3092c1451ac29cad35ff2ff9f7f98':
docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support.
Wink Saville [Mon, 11 Aug 2014 16:58:44 +0000 (09:58 -0700)]
Fix CellIdentityLte.equals
Bug:
16902094
Change-Id: I92786dc792bf318d2236212eb2acf955ec41e066
Quddus Chong [Tue, 12 Aug 2014 22:38:14 +0000 (22:38 +0000)]
Merge "docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support." into klp-modular-docs
Quddus Chong [Fri, 18 Jul 2014 20:21:48 +0000 (13:21 -0700)]
docs: Updated L Preview Overview and support page with information about using NDK r10 for 64-bit support.
Change-Id: Ib759f6a187a8a1298d01f8485a8e05e5d9b67e27
Robert Ly [Tue, 12 Aug 2014 19:52:21 +0000 (19:52 +0000)]
am
378b2558: am
41e836a6: Merge "docs: update dashboard" into klp-modular-docs
* commit '
378b25584f3ddeb242dfc3c9c161512a897cc0d8':
docs: update dashboard
Robert Ly [Tue, 12 Aug 2014 19:45:28 +0000 (19:45 +0000)]
am
41e836a6: Merge "docs: update dashboard" into klp-modular-docs
* commit '
41e836a644b1fa767fdcce629bbb4753e0f5ecd6':
docs: update dashboard
Alan Viverette [Tue, 12 Aug 2014 22:32:17 +0000 (22:32 +0000)]
Merge "Use correct checked value when animating Switch" into lmp-dev
Alan Viverette [Tue, 12 Aug 2014 22:13:19 +0000 (15:13 -0700)]
Use correct checked value when animating Switch
BUG:
16984959
Change-Id: I1b4ffea568619663e26c097a28b86579d090c0ce
Robert Ly [Tue, 12 Aug 2014 19:40:31 +0000 (19:40 +0000)]
Merge "docs: update dashboard" into klp-modular-docs
Robert Ly [Tue, 12 Aug 2014 19:26:37 +0000 (12:26 -0700)]
docs: update dashboard
Change-Id: I3a11a4ffbd9e5544c598bdebacd67e236305602f
Adam Lesinski [Tue, 12 Aug 2014 22:20:21 +0000 (22:20 +0000)]
Merge "AAPT: Dump an APK's split name attribute" into lmp-dev
Adam Lesinski [Mon, 11 Aug 2014 16:41:56 +0000 (09:41 -0700)]
AAPT: Dump an APK's split name attribute
Bug:
16919497
Change-Id: I109e21bff9e4a64a10f48dce7f2d41102b32ee1d
Alan Viverette [Tue, 12 Aug 2014 22:14:15 +0000 (22:14 +0000)]
Merge "Invalidate root render node when accessibility focus moves" into lmp-dev
Winson Chung [Tue, 12 Aug 2014 22:04:55 +0000 (22:04 +0000)]
Merge "Clearing tasks along with application data. (Bug
16952119)" into lmp-dev
Adrian Roos [Tue, 12 Aug 2014 21:33:49 +0000 (23:33 +0200)]
Implement final lock now affordance
Also removes the GlobalAction. Also fixes the animation not
being applied to the background of the affordance.
Bug:
15344542
Bug:
16952834
Change-Id: Ie790b40a5d1ba10fa42a793c8cfeaf6687d17c61
Robert Greenwalt [Fri, 8 Aug 2014 21:19:58 +0000 (14:19 -0700)]
Remove extraneous clearing of inet condition
This was old code I missed in previous inet condition refactor
and caused us to show "not connect" icon any time we connected
to a secondary network (mms/supl/etc).
bug:
16896743
Change-Id: I0fa62e09bb0b7c0ee0864bb1f95967eac5f60d3e
Winson Chung [Tue, 12 Aug 2014 18:39:53 +0000 (11:39 -0700)]
Clearing tasks along with application data. (Bug
16952119)
Change-Id: Ie986712a7d7d0911b6de7a4b34b7d03bf7874d6f
Alan Viverette [Tue, 12 Aug 2014 21:12:55 +0000 (21:12 +0000)]
Merge "Fix NPE in NinePatchDrawable, propagate theme in StateListDrawable" into lmp-dev
Adrian Roos [Tue, 12 Aug 2014 20:25:35 +0000 (22:25 +0200)]
Update brightness slider thumb and spacing
Also fixes a few errors in the measuring logic.
Bug:
15170399
Change-Id: I7ce7edef0a08dc00ef747988cd64e40a9fbae192
Jorim Jaggi [Fri, 8 Aug 2014 15:00:47 +0000 (17:00 +0200)]
Preparations for lockscreen launch animations
- Update unlock animations to new spec to make the consistent with
lockscreen launch animations.
- Introduce disappearing motion for security views which runs before
we actually dismiss Keyguard.
- If a window is running the un-force-hide animation, treat as it
would have the wallpaper flag set so the wallpaper stays until
the animation is completely done.
- Run an animation on the wallpaper if the wallpaper is going away.
Bug:
15991916
Bug:
16234603
Bug:
15326120
Change-Id: I063aa4f269ddcf75b9a705e90f0c3056b541b642
Adam Lesinski [Mon, 11 Aug 2014 22:03:32 +0000 (15:03 -0700)]
Fix NPE in UsageStats for new User
Bug:
16946585
Change-Id: Ibd0d674681f3f49087305cea33ce7292f5d2229d
Robert Ly [Tue, 12 Aug 2014 20:06:20 +0000 (20:06 +0000)]
am
ecae7cb0: am
378b2558: am
41e836a6: Merge "docs: update dashboard" into klp-modular-docs
* commit '
ecae7cb04fd16b2d79f156c0c50c48c1fc592a1e':
docs: update dashboard
Jorim Jaggi [Tue, 12 Aug 2014 19:56:55 +0000 (19:56 +0000)]
Merge "New lock pattern assets and animations" into lmp-dev
Chris Craik [Tue, 12 Aug 2014 19:47:22 +0000 (19:47 +0000)]
Merge "Rework shadow interpolation" into lmp-dev
Chris Craik [Mon, 11 Aug 2014 23:00:44 +0000 (16:00 -0700)]
Rework shadow interpolation
bug:
16852257
Use pow(alpha, 1.5) to avoid harsh edges on shadow alpha ramps.
Also adjusts shadow constants to compensate.
Change-Id: I5869956d7d292db2a8e496bc320084b6d64c3fb7
Chris Craik [Sat, 9 Aug 2014 01:42:51 +0000 (18:42 -0700)]
Fix ripples projecting to scrolled view
bug:
16873774
1) Fix projectionReceiveIndex, which could in some cases point at
translate/restore ops.
2) Use background translateX / translateY for projected RenderNodes.
This makes them match background position, and thus properly account
for scroll.
Change-Id: Idbd5700858fd67c5abea0270a1012952fe09ac22
Jorim Jaggi [Thu, 7 Aug 2014 20:15:48 +0000 (22:15 +0200)]
New lock pattern assets and animations
Also removes the arrows.
Bug:
16196240
Bug:
13735707
Change-Id: I5a6606d916192fff594c7e6211e80b73ccd30456
Alan Viverette [Tue, 12 Aug 2014 18:16:01 +0000 (11:16 -0700)]
Fix NPE in NinePatchDrawable, propagate theme in StateListDrawable
BUG:
16979150
BUG:
16957778
Change-Id: I5e7116fe7fd3d5d177bafa88aad08ab21ae1677d
Winson Chung [Tue, 12 Aug 2014 18:29:31 +0000 (18:29 +0000)]
Merge "Ensuring that we update the calling uid/package when updating a task's original intent. (Bug
16676636)" into lmp-dev
John Reck [Tue, 12 Aug 2014 18:17:45 +0000 (18:17 +0000)]
Merge "Don't use libhwui to draw starting window" into lmp-dev
John Reck [Tue, 12 Aug 2014 16:27:33 +0000 (09:27 -0700)]
Don't use libhwui to draw starting window
Bug:
16735410
Change-Id: I763c10b9d34eadcb768ad580d2387b1e825cbd53
Winson Chung [Tue, 5 Aug 2014 19:21:52 +0000 (12:21 -0700)]
Ensuring that we update the calling uid/package when updating a task's original intent. (Bug
16676636)
Change-Id: I5d75a912e86e83f05717cb19e9b6edb02eb053e6
Sailesh Nepal [Tue, 12 Aug 2014 19:08:21 +0000 (19:08 +0000)]
Merge "Override StatusHints.equals" into lmp-dev
Sailesh Nepal [Tue, 12 Aug 2014 18:53:32 +0000 (11:53 -0700)]
Override StatusHints.equals
Bug:
16979621
Change-Id: I858a4718a8815be18214400d3bc1d9054b99434e
Jean-Michel Trivi [Tue, 12 Aug 2014 17:47:44 +0000 (17:47 +0000)]
Merge "HDMI plug intent and associated information" into lmp-dev
Jean-Michel Trivi [Sun, 10 Aug 2014 21:59:15 +0000 (14:59 -0700)]
HDMI plug intent and associated information
Read HDMI device information from audio ports and add it as
extras in the connection intent.
Document the new extras in the connection intent.
Make Intent.ACTION_HDMI_AUDIO_PLUG public.
Bug
10549017
Change-Id: I6236b5363f00c433e443195fae8c43af2fc834f7
Deepanshu Gupta [Tue, 12 Aug 2014 17:13:16 +0000 (17:13 +0000)]
Merge "Improve error reporting when renaming fonts." into lmp-dev
Deepanshu Gupta [Tue, 12 Aug 2014 17:13:15 +0000 (17:13 +0000)]
Merge "Don't show warnings for fonts not bundled." into lmp-dev
Deepanshu Gupta [Mon, 11 Aug 2014 22:24:38 +0000 (15:24 -0700)]
Improve error reporting when renaming fonts.
Log a better error in case of invalid input.
Change-Id: Ifb122c1cc624111769e650439aa24290155dbbc4
Deepanshu Gupta [Sat, 9 Aug 2014 21:14:32 +0000 (14:14 -0700)]
Don't show warnings for fonts not bundled.
The extended font set, used on Nexus 5, new Nexus 7 etc., uses OpenType
CFF fonts which don't work well with Java. These fonts are deliberately
excluded from the SDK build.
This change skips the warnings for the missing fonts. However, we still
show warnings for other fonts that failed to load. If the set of fonts
bundled with the SDK changes, we will need to update the list of missing
fonts in FontFamily_Delegate.java.
Change-Id: I3197b5350d048daa09512e8024188909179b1799
Alan Viverette [Mon, 11 Aug 2014 21:13:02 +0000 (14:13 -0700)]
Invalidate root render node when accessibility focus moves
BUG:
16796647
Change-Id: Ibfc6ec4aa50c6354ea095a35470dd54e768d911b
Selim Cinek [Mon, 11 Aug 2014 20:32:57 +0000 (22:32 +0200)]
Fixed a bug in the notification stack algorithm
Bad holes could occur when a notification was at the same time in
the top and the bottom stack. This also improves the landscape /
smallscreen interaction with the shade.
Bug:
16715133
Change-Id: Icbb4d080e658f4ddbd39b7d08652ca5311a47978
Geoff Mendal [Mon, 11 Aug 2014 20:31:17 +0000 (13:31 -0700)]
Merge branch 'lmp-dev' of sso://googleplex-android.git.corp.google.com/platform/frameworks/base into lmp-dev
Geoff Mendal [Mon, 11 Aug 2014 20:30:55 +0000 (13:30 -0700)]
Don't double count the left/top when using bitmap cache in VectorDrawable.
bug:
16861184
Change-Id: I0530602957a434b222725b6fcbc1af165ee05835
Merge commit 'refs/changes/18/520718/4' of persistent-https://googleplex-android.git.corp.google.com/platform/frameworks/base into lmp-dev
Igor Murashkin [Sat, 9 Aug 2014 00:40:17 +0000 (17:40 -0700)]
camera2: (legacy) Fix the comparison for fixed-focus cameras
* Use #equals instead of == for string comparison
* Also make sure lens.info.minimumFocusDistance shows up in
CameraCharacteristics#getKeys() for fixed-focus cameras
Bug:
16900875
Change-Id: I3b9248c5cb62ddcfb13587c6349525e145e353ac
Igor Murashkin [Fri, 8 Aug 2014 23:44:34 +0000 (16:44 -0700)]
camera: (LEGACY) - Add captureIntent and physicalSize metadata
Bug:
16900182
Change-Id: I159f2416da71c2d7ea803d61b63476da90e03b1c
Igor Murashkin [Fri, 8 Aug 2014 21:02:36 +0000 (14:02 -0700)]
camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
Bug:
16898478
Change-Id: I4306f6380ea06e8bd95af8738e5dde1a42a8098c
Brian Attwell [Tue, 12 Aug 2014 17:46:40 +0000 (17:46 +0000)]
Merge "Compose QC intent with FLAG_ACTIVITY_SINGLE_TOP" into lmp-dev
ztenghui [Tue, 12 Aug 2014 16:16:19 +0000 (09:16 -0700)]
VD: Fix Canvas save leak
bug:
16965998
Change-Id: I367388b270748e2ce114b468940966d78de07465
Brian Attwell [Tue, 12 Aug 2014 05:42:26 +0000 (22:42 -0700)]
Compose QC intent with FLAG_ACTIVITY_SINGLE_TOP
Since launchMode=singleTop is broken in the framework.
Bug:
16519102
Change-Id: I136821ab9d4493c51f03332cee1e3924a1bd361b
Jason Monk [Mon, 11 Aug 2014 19:16:13 +0000 (19:16 +0000)]
Merge "Make simple user switcher notice setting changes." into lmp-dev
Ricardo Cervera [Mon, 11 Aug 2014 19:15:02 +0000 (19:15 +0000)]
am
18718444: am
97dbb136: am
6bb49e4a: Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs
* commit '
18718444b99b4b631021d5452161c7338cb99473':
docs: Fixed minor issue with Studio shortcuts
Jason Monk [Mon, 11 Aug 2014 17:42:32 +0000 (13:42 -0400)]
Make simple user switcher notice setting changes.
To do this just check the state from the controller (which listens
for changes), rather than holding state locally.
Bug:
16888009
Change-Id: Ifdbf0055c7aa100941c6504cf3f469031c9c6e43
Adrian Roos [Tue, 12 Aug 2014 17:34:47 +0000 (17:34 +0000)]
Merge "Hide panel while changing brightness" into lmp-dev
Adrian Roos [Tue, 12 Aug 2014 16:21:09 +0000 (18:21 +0200)]
Respect DPM flags for lockscreen notifications
Disables unredacted or all notifications based on device policy.
Bug:
15934116
Change-Id: Ia012e44da8fbf73c24e26950abb1df76af7001a9
Adrian Roos [Tue, 12 Aug 2014 15:28:58 +0000 (17:28 +0200)]
Hide panel while changing brightness
Bug:
15408618
Change-Id: Ic1f934f9ddbb582453b4b52a4b4402c71ac79654
Raph Levien [Mon, 11 Aug 2014 19:56:04 +0000 (19:56 +0000)]
Merge "Copy fonts.xml to /system/etc" into lmp-dev
Adrian Roos [Mon, 11 Aug 2014 19:29:36 +0000 (19:29 +0000)]
Merge "QS: Update user switcher details" into lmp-dev
Adrian Roos [Mon, 11 Aug 2014 18:36:01 +0000 (20:36 +0200)]
QS: Update user switcher details
- Update icon colors to white
- Change label for adding a guest
Bug:
16897120
Bug:
16898990
Change-Id: I0541d35df8c03bfeb3ee931d8074a7fe1064b2db
Winson Chung [Mon, 11 Aug 2014 19:23:51 +0000 (19:23 +0000)]
Merge "Updating accessibility message for Recents activity. (Bug
15570522)" into lmp-dev
Winson Chung [Mon, 11 Aug 2014 17:43:22 +0000 (10:43 -0700)]
Updating accessibility message for Recents activity. (Bug
15570522)
Change-Id: Iaaedb9a66b2160015b304863a00fbefdfb0e10ea
Winson Chung [Mon, 11 Aug 2014 19:23:44 +0000 (19:23 +0000)]
Merge "Tweaking empty recents text. (Bug
16711522)" into lmp-dev
Winson Chung [Fri, 8 Aug 2014 19:53:09 +0000 (12:53 -0700)]
Initial changes to support swiping on the nav bar to switch affiliated tasks.
- Actual sideways animations to come once they've been finalized
Bug:
16846966
Change-Id: If6d40495498197a86a98f9b03f54ced3d2baf64a
Winson Chung [Fri, 8 Aug 2014 20:04:53 +0000 (13:04 -0700)]
Tweaking empty recents text. (Bug
16711522)
Change-Id: I338e2add6e4a46551ce7d52e873f332979b194e1
Deepanshu Gupta [Tue, 12 Aug 2014 17:12:53 +0000 (17:12 +0000)]
Merge "Resolve color xml attributes properly." into lmp-dev
Deepanshu Gupta [Sat, 9 Aug 2014 21:14:45 +0000 (14:14 -0700)]
Resolve color xml attributes properly.
Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.
Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
Baligh Uddin [Tue, 12 Aug 2014 16:52:54 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Tue, 12 Aug 2014 16:52:33 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 11 Aug 2014 20:11:54 +0000 (13:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I19b9647d1f535c00fbf17a3508e30dab5b3b3054
Auto-generated-cl: translation import
Baligh Uddin [Mon, 11 Aug 2014 19:52:01 +0000 (12:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05a1dc49c04d92092723d84c7fdadf7e190b5476
Auto-generated-cl: translation import
Baligh Uddin [Tue, 12 Aug 2014 16:52:23 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Tue, 12 Aug 2014 16:52:09 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 11 Aug 2014 21:47:50 +0000 (14:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I70fade0a8a1cba8734874b955634c7296c9aaff7
Auto-generated-cl: translation import
Baligh Uddin [Mon, 11 Aug 2014 21:27:01 +0000 (14:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ice9a22422396849c763e2fcc011567e2527c7556
Auto-generated-cl: translation import
RoboErik [Tue, 12 Aug 2014 16:36:52 +0000 (16:36 +0000)]
Merge "Fix registering global priority sessions" into lmp-dev
RoboErik [Mon, 11 Aug 2014 23:50:18 +0000 (16:50 -0700)]
Fix registering global priority sessions
We were never setting a global priority session due to a change in
the way sessions were registered. This makes sure a global session
gets set correctly.
bug:
16930866
Change-Id: I859846c9265e98bb1a37ff9d22808137e787ce18
Selim Cinek [Tue, 12 Aug 2014 16:00:10 +0000 (16:00 +0000)]
Merge "Fixed a bug where a notification had no background" into lmp-dev
Robin Lee [Thu, 24 Jul 2014 15:41:31 +0000 (16:41 +0100)]
Clean up DevicePolicyManager CA certificate APIs
For consistency all CA-related methods now require the ComponentName
of a DeviceAdminReceiver as the first parameter. Updated javadoc for
this and added in some more detail about the methods in general as
well.
Created two new utility APIs,one to list all installed CAs and one to
remove all installed (user) CAs. Deleted old hasAnyCaCertsInstalled
method because it is now redundant.
@bug
16488006
Change-Id: I55eec17e01489ab323f8a0e68b11592605a7b740
Selim Cinek [Tue, 12 Aug 2014 14:01:41 +0000 (16:01 +0200)]
Fixed a bug where a notification had no background
When tapping on a notification and then dragging down,
the notification had no background anymore
Bug:
16191184
Change-Id: I233a45744fc39ac3fcd9f533c8427354ab384709
George Mount [Tue, 12 Aug 2014 14:36:05 +0000 (14:36 +0000)]
Merge "Pass elevation to enable shadow in shared elements." into lmp-dev
Sungsoo Lim [Tue, 12 Aug 2014 08:46:45 +0000 (17:46 +0900)]
Add equals method of TvContentRating
Bug:
16963556
Change-Id: I09869d322fc2056ef1df5d2ca95891263646b46f
George Mount [Fri, 8 Aug 2014 22:43:59 +0000 (15:43 -0700)]
Pass elevation to enable shadow in shared elements.
Bug
15932772
Change-Id: Ia4cb89035244656a2dd24936bf0e36a5b7970ea6
Jaewan Kim [Tue, 12 Aug 2014 13:28:14 +0000 (13:28 +0000)]
Merge "Treat empty subrating as the same as null subratings." into lmp-dev
Jaewan Kim [Tue, 12 Aug 2014 12:56:41 +0000 (21:56 +0900)]
Treat empty subrating as the same as null subratings.
Change-Id: Ic288c680c639ccba6cf593d1286776a6c891b726
Jeff Davidson [Tue, 12 Aug 2014 03:39:00 +0000 (03:39 +0000)]
Merge "Security-related cleanup for network scoring." into lmp-dev
Jeff Davidson [Fri, 8 Aug 2014 22:12:47 +0000 (15:12 -0700)]
Security-related cleanup for network scoring.
-Perform additional checks for the SCORE_NETWORKS permission when
broadcasting scoring requests to the active scorer and when accepting
score updates. In theory, these checks are unnecessary as we manually
check package manager when obtaining the list of valid scorers, but
they cannot hurt to add.
-Fix multi-user. Since the active scorer is a global setting, we
ensure that scoring can only be done by apps available to the primary
user / owner of the phone, and that the request scores broadcast is
sent to that user's profile. When the scorer is changed, we send that
to all user profiles as it's just informational, although it's
unlikely that apps outside the primary user's profile would need to
respond.
Bug:
14117916
Bug:
16399238
Change-Id: Iaf06bda244eec730b590a30a3f4ffab4965bde96
Sungsoo Lim [Tue, 12 Aug 2014 13:01:35 +0000 (13:01 +0000)]
Merge "Add version attribute in tv_content_rating_system.xml" into lmp-dev
Sungsoo Lim [Tue, 12 Aug 2014 12:49:20 +0000 (21:49 +0900)]
Add version attribute in tv_content_rating_system.xml
- 'version' attribute is added in 'rating-system-definitions' tag.
- Update javadoc for the format change of XML file in TvContentRating.
- Fix some errors in the javadoc comment.
Bug:
16805703
Change-Id: If9473c89cef0777232470d67f1542a5e5eac3182
Yuncheol Heo [Tue, 12 Aug 2014 08:23:34 +0000 (08:23 +0000)]
Merge "Use the system property for the HdmiControlService configuration." into lmp-dev
Yuncheol Heo [Tue, 12 Aug 2014 06:30:49 +0000 (15:30 +0900)]
Use the system property for the HdmiControlService configuration.
- We've used the system resoure overlay for this purpose, but we found
that it's hard for OEM which uses PDK to override this. Since the
resource was already compiled and provided as a binary, so it's hard
to change it.
Bug:
16965963
Change-Id: I868305d6f76c128d79c00ab6a8023656cd476c62
Wonsik Kim [Tue, 12 Aug 2014 08:21:15 +0000 (08:21 +0000)]
Merge "TIF: small refactoring around audio configuration update" into lmp-dev