OSDN Git Service
Jungshik Jang [Wed, 6 Aug 2014 04:54:20 +0000 (04:54 +0000)]
Merge "More tweaks for recording" into lmp-dev
Brian Carlstrom [Wed, 6 Aug 2014 04:09:29 +0000 (21:09 -0700)]
Remove java.lang.reflect.ArtMethod accidentally added in
ad601d76e820ba680b14b7016d2e79763b7f4663
Change-Id: Ib01118d950e7cfe91c87a34489c51777262125bf
Jungshik Jang [Tue, 5 Aug 2014 08:48:59 +0000 (17:48 +0900)]
More tweaks for recording
1. Mask TimerClearedStatus message result.
2. Use proper mask for media info.
Change-Id: I7ed6f6839c333460a7bef5e5a84af2a9a34c6d97
Dongwon Kang [Wed, 6 Aug 2014 02:55:23 +0000 (02:55 +0000)]
Merge "TIF: Add content rating system for Spain" into lmp-dev
Dongwon Kang [Tue, 5 Aug 2014 09:04:54 +0000 (18:04 +0900)]
TIF: Add content rating system for Spain
References:
- http://codigodeautorregulacion.rtve.es/senalizacion-de-los-programas/advertencias-opticas/
- http://en.wikipedia.org/wiki/RTVE
Change-Id: Icdde8a7f8cfb07cc4f768f95ba764ae6a519e347
Aravind Akella [Tue, 5 Aug 2014 22:02:11 +0000 (15:02 -0700)]
Sensor related changes for NDK.
i) Add ASensor_isWakeUpSensor and ASensorManager_getDefaultSensorEx
methods.
Bug:
16399898
Change-Id: Icc252aad068fa337bef8b22f20584f98cd5a155d
Dongwon Kang [Tue, 5 Aug 2014 05:28:02 +0000 (14:28 +0900)]
TIF: make TvInputService.Session class static
This change would make the developers freely extend the Session class
out of the TvInputService class.
Change-Id: I7dc9501c771a6e4dcfcceeb1b294b95e612596eb
Michael Wright [Wed, 23 Jul 2014 02:46:03 +0000 (19:46 -0700)]
Add supported refresh rate to displays
Change-Id: I51231dd6dd231d57dd1ac499349d6335121f07d5
Wonsik Kim [Mon, 4 Aug 2014 09:57:47 +0000 (18:57 +0900)]
TIF: TvInputHardwareManager to listen to audio port changes
Bug:
16758816
Change-Id: I0c7ace661de1911a53f57e22898eccd7cca7a07d
Ihab Awad [Wed, 30 Jul 2014 17:07:40 +0000 (10:07 -0700)]
Finalize implementation of Remote Connection Service (1/4)
Change-Id: I3788c9ab03a979f22ab628637adf6d520038cb6e
Youngsang Cho [Wed, 6 Aug 2014 01:18:26 +0000 (01:18 +0000)]
Merge "Add system APIs to set Z-order of TvView" into lmp-dev
Youngsang Cho [Tue, 5 Aug 2014 04:32:41 +0000 (13:32 +0900)]
Add system APIs to set Z-order of TvView
Bug:
16723028
Change-Id: I43c840ca2065920360859f8814a0c76ab2937ac1
Jeff Sharkey [Wed, 6 Aug 2014 00:55:16 +0000 (17:55 -0700)]
Use system collator for display names.
Continue sorting directory names first, but use system collator in
case-insensitive ordering.
Bug:
13545569
Change-Id: I24b314c9ef42f397bc96f474d9593bdefc0061d1
Adam Powell [Wed, 6 Aug 2014 01:14:28 +0000 (01:14 +0000)]
Merge "Fall-through for ActionModes with ToolbarActionBar" into lmp-dev
Adam Powell [Tue, 5 Aug 2014 23:38:53 +0000 (16:38 -0700)]
Fall-through for ActionModes with ToolbarActionBar
When using ToolbarActionBar simply fall through to the default window
decor behavior for showing action modes.
Bug
16660506
Change-Id: Ib90282287b2af48f39f9d9ace296581565431eed
Chris Craik [Tue, 5 Aug 2014 00:55:22 +0000 (17:55 -0700)]
Move clip bound execution into drawChild()
bug:
15698973
This makes native and java implementations match up in the sequence of
clip vs applying other properties / draw calls.
Change-Id: Ia75e00c5b42f81ecd516722ef1c5233d483e0c97
Jeff Sharkey [Tue, 5 Aug 2014 17:42:27 +0000 (10:42 -0700)]
Stronger constraints around install session IDs.
Generate positive, non-zero session IDs, and don't recycle them
within a given boot. Guard against ID starvation by crazy apps.
Bug:
16792837
Change-Id: I6035afe4d942d358b5ca12b4f818c55885b74aba
Shishir Agrawal [Wed, 6 Aug 2014 01:05:25 +0000 (01:05 +0000)]
Merge "Return APDU status code on tramsit channel command failure." into lmp-dev
Winson Chung [Wed, 6 Aug 2014 01:00:13 +0000 (18:00 -0700)]
Fixing issue where home was triggered on top of other activities being launched. (Bug
16823617)
- Also fixes issue with the Recents hide message being clobbered
Shishir Agrawal [Wed, 6 Aug 2014 00:06:51 +0000 (17:06 -0700)]
Return APDU status code on tramsit channel command failure.
Change-Id: I2d506a6ddbb4e27a04f57941247924d36c9d279b
Michael Wright [Wed, 30 Jul 2014 01:28:47 +0000 (18:28 -0700)]
Ensure backup schedule file is closed.
Change-Id: Ie4a62cda74815c67c62fb08e8df25a71d6102d4c
Eric Laurent [Tue, 5 Aug 2014 19:54:20 +0000 (19:54 +0000)]
Merge "SoundTrigger API update." into lmp-dev
ztenghui [Tue, 5 Aug 2014 18:58:45 +0000 (11:58 -0700)]
Update the system linear progress bar
bug:
14622065
Change-Id: Ic08022d934763ba0cc6067af3e50c4afeb8a0e9e
Jorim Jaggi [Tue, 5 Aug 2014 19:12:02 +0000 (21:12 +0200)]
Fix not being able to dismiss panel with single tap
Bug:
16562847
Change-Id: Ic409b9dd23df7e79a20b83a8a63eaaf1f76b3dd0
Jorim Jaggi [Tue, 5 Aug 2014 19:04:39 +0000 (21:04 +0200)]
Navbar scrim when in QS
Bug:
16644711
Change-Id: I91d823671919068500a29878f3dfe9b481000a58
Craig Mautner [Tue, 5 Aug 2014 00:08:25 +0000 (17:08 -0700)]
Use actual number of packages rather than getCount()
The ResolverActivity method getCount() returns the number of
entries below the default entry, not the total number of entries.
But the onCreate() method expected the getCount() method to
return the total number of entries. This change provides the total
to onCreate().
Fixes bug
16800358.
Change-Id: I3915c3d5ad642e31d7248226fc91bd4047f16b2d
Santos Cordon [Tue, 5 Aug 2014 19:09:43 +0000 (19:09 +0000)]
Merge "Revert "Make Connection threadsafe"" into lmp-dev
Santos Cordon [Tue, 5 Aug 2014 18:54:03 +0000 (18:54 +0000)]
Revert "Make Connection threadsafe"
This reverts commit
53488bf3d152eb0ecacca5716c763e8cd7ab28ae.
Change-Id: Ia13c510279e600e8bd1445fd63e2cd6503f4077e
Jorim Jaggi [Tue, 5 Aug 2014 18:39:15 +0000 (20:39 +0200)]
Show bouncer if secure camera would show chooser.
Bug:
16570873
Change-Id: I2a86fb3a823d5255c0c35a78c1832c273e3a1578
Jeff Sharkey [Mon, 4 Aug 2014 22:32:42 +0000 (15:32 -0700)]
Scan after writing external storage files.
Kicks off media scanner after files are written.
Bug:
13557203
Change-Id: I61613f28e07b068573079cc1e362fd3fe135684e
Jason Monk [Tue, 5 Aug 2014 17:28:00 +0000 (17:28 +0000)]
Merge "Disable heads up when DISABLE_NOTIFICATION_ALERT" into lmp-dev
Jorim Jaggi [Tue, 5 Aug 2014 17:17:42 +0000 (19:17 +0200)]
Update keyguard icon paddings to spec.
Bug:
15381387
Change-Id: Ia75394fd68f66233ebabe9ec4f62b42d40d19eb9
Jason Monk [Thu, 31 Jul 2014 16:42:25 +0000 (12:42 -0400)]
Disable heads up when DISABLE_NOTIFICATION_ALERT
When notification alerts are disabled also turn off heads up. This
will fall back to the old behavior, which can allow the fullscreen
intent to be triggered instead.
Bug:
14157742
Change-Id: I4b6e3d9383894b1674d600c374ff8968ca53513e
Jeff Sharkey [Tue, 5 Aug 2014 17:14:45 +0000 (10:14 -0700)]
DocumentsUI is only dialog when really large.
Bug:
16780860
Change-Id: Ib20ef9771855beba5b31d19887c1c9c1b8e8e5ed
Jorim Jaggi [Tue, 5 Aug 2014 17:10:59 +0000 (17:10 +0000)]
Merge "Revert "Clean up hiden notifications on Keyguard handling"" into lmp-dev
Jorim Jaggi [Tue, 5 Aug 2014 17:10:43 +0000 (17:10 +0000)]
Revert "Clean up hiden notifications on Keyguard handling"
This reverts commit
d9267cae958b572b715d22a4905b18749a369c9f.
Too much performance regression - need to figure out something else.
Change-Id: I2d399add74402e1c036235ec095a053a6d5b828e
Jorim Jaggi [Tue, 5 Aug 2014 14:22:30 +0000 (16:22 +0200)]
Clean up hiden notifications on Keyguard handling
Change-Id: Ifeabfdd1ed8c11b0796cc79bba81752518921be3
Justin Koh [Tue, 5 Aug 2014 16:56:02 +0000 (16:56 +0000)]
Merge "Allow listeners to see children" into lmp-dev
Justin Koh [Tue, 5 Aug 2014 01:29:49 +0000 (18:29 -0700)]
Allow listeners to see children
Allow listeners to see notification children. Since L is not baked yet, keeping
this version check makes it difficult to test apps.
Bug:
16733244
Change-Id: I70afd6b99fc18c1f0b9188279c04fab80c37d414
Shriram Ganesh [Wed, 9 Jul 2014 01:48:35 +0000 (18:48 -0700)]
IMS Framework & AIDL Changes for Call Barring & String Error Codes.
Change-Id: I66fdbbd175c13261c283627999f37071259f7a6a
Jean-Michel Trivi [Tue, 5 Aug 2014 16:39:21 +0000 (16:39 +0000)]
Merge "AudioAttributes: implement hashcode and equals methods" into lmp-dev
Nicolas Prevot [Tue, 5 Aug 2014 17:10:50 +0000 (17:10 +0000)]
Merge "Security fixes related to cross-user content." into lmp-dev
Svet Ganov [Tue, 5 Aug 2014 16:52:18 +0000 (09:52 -0700)]
Fix cross-user permission checks in print manager service.
The cross-user check was requesting both interact across users and
interact across users all permissions which is too restrictive. Each
one is sufficient. Further, if the app has one of these premissions
but specifies a given user not current or current-self, the code
was throwing while the correct actions is to return the requested
user id as we alreay vetted the caller's permissions.
bug:
16398152
Change-Id: I1a4863eb7b05dababb66bac6e143b78dfad42b81
Nicolas Prevot [Thu, 26 Jun 2014 09:07:33 +0000 (10:07 +0100)]
Security fixes related to cross-user content.
Enforcing that only uri grants work across users (not permissions).
Fixing a security hole where malicious Apps could access a uri if they had uri grants to the same uri on another user.
Enforcing that userIds in uris, if they exist, are the one of the ContentProvider.
BUG:
16779492
Change-Id: Iaa5264bd6c3aa0e15be3a4a64f9dc88238e0cb2e
Andre Eisenbach [Tue, 5 Aug 2014 00:51:43 +0000 (17:51 -0700)]
Add transport parameter to createBond() function (4/4)
Bug:
14063256
Change-Id: I096248b60752992aa23ce5bfbfc47fda95773db2
Torne (Richard Coles) [Tue, 5 Aug 2014 16:05:14 +0000 (16:05 +0000)]
Merge "Log the version of the WebView package used." into lmp-dev
Svet Ganov [Tue, 5 Aug 2014 15:41:08 +0000 (08:41 -0700)]
Properly update accessibility manager state.
Applciations that fire accessibility events have to first check
it accessibility is on and then fire the event. If the app fires
an event when the feature is off an exception is thrown. However,
due to the way accessibility state is pushed to the local
accessibility manager it was possible that the app checks that
aaccessibility is off, fires an event, then the state of the
local manager changes by the time the event is propagated up
the view tree and an exception is thrown. This is a regression.
We really want this exception to prevent apps sending events
across processes if accessibility is off, so now the state
we get from the system manager service is applied via a
message so if the app checks that accessibility is off, then
it will remain off (locally) until the event is propagated.
bug:
16672964
Change-Id: Icf5d1b1bdff87b58f285f0d9e1a098552513bbe8
Torne (Richard Coles) [Tue, 5 Aug 2014 15:12:09 +0000 (16:12 +0100)]
Log the version of the WebView package used.
To aid in debugging app behaviour when WebView updates may be present,
log the package name, version name, and version code of the WebView
package when we are about to load it into an application. Do this before
we actually load any part of the package in case of an issue loading it
in the first place.
Change-Id: Id653bad431760b7ead8e3f8eb29f9d6a8bb68d07
Yuncheol Heo [Tue, 5 Aug 2014 05:48:37 +0000 (14:48 +0900)]
Refactor <Feature Abort> logic to concentrate it in one place.
- Don't reply from the unregistered address.
- Use "unrecognized opcode" as the default reason.
Bug:
16799466, Bug:
16798785
Change-Id: I7c2ece6436f7ebd59986d2baf4f45cd86e6622d9
Hector Dearman [Tue, 5 Aug 2014 16:00:48 +0000 (16:00 +0000)]
Merge "Fix CookieSyncManager package summary" into lmp-dev
Hector Dearman [Tue, 5 Aug 2014 09:55:30 +0000 (10:55 +0100)]
Fix CookieSyncManager package summary
Putting the deprecated at the beginning of a class comment seems
to cause problems with JavaDoc so I've moved it to the end.
Bug:
16799480
Change-Id: Ia23dab2ad8ceb8e107e047480b5cb324d11a1457
Sungsoo Lim [Wed, 6 Aug 2014 00:39:56 +0000 (00:39 +0000)]
Merge "TIF: Add content ratings for Netherlands" into lmp-dev
Sungsoo Lim [Mon, 4 Aug 2014 07:46:14 +0000 (16:46 +0900)]
TIF: Add content ratings for Netherlands
Change-Id: I17bac9587ea549f5e22bfe9c03fa50999fee5d5f
David Christie [Wed, 6 Aug 2014 00:31:58 +0000 (00:31 +0000)]
Merge "Fix issue where FlpHardwareProvider can crash if GmsCore re-registers a sink." into lmp-dev
David Christie [Tue, 5 Aug 2014 21:42:37 +0000 (14:42 -0700)]
Fix issue where FlpHardwareProvider can crash if GmsCore re-registers a sink.
Change-Id: If6f4e9bc3c5be6ca537de2dae1fddd6351350e9e
Sungsoo Lim [Tue, 5 Aug 2014 23:53:23 +0000 (23:53 +0000)]
Merge "TIF: Remove countryCode in TvContentRating" into lmp-dev
Jorim Jaggi [Tue, 5 Aug 2014 23:35:21 +0000 (01:35 +0200)]
Fix more card on Keyguard overflow.
Bug:
15719165
Change-Id: Ie1e99dd722d7fcd52c0ce2eda968885835004b2b
Jorim Jaggi [Tue, 5 Aug 2014 23:12:32 +0000 (01:12 +0200)]
Fix pressed state when long pressing nav bar buttons
Bug:
16018025
Change-Id: Ic2bc96feae8a68e471fe902ae05611719ecf8dad
Sungsoo Lim [Tue, 5 Aug 2014 08:36:33 +0000 (08:36 +0000)]
Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev
Sungsoo Lim [Tue, 5 Aug 2014 05:55:05 +0000 (14:55 +0900)]
TIF: A preliminary CL to add multiple rating systems
TODO: Add rating systems for the countries defined in this CL.
Change-Id: I128284fd8779723b5ffb5968e2a11ce4b4eae6b5
Sungsoo Lim [Wed, 6 Aug 2014 00:30:35 +0000 (00:30 +0000)]
Merge "TIF: Add content ratings for Germany" into lmp-dev
Sungsoo Lim [Tue, 5 Aug 2014 02:43:48 +0000 (11:43 +0900)]
TIF: Add content ratings for Germany
Change-Id: I7233e5d10550d6e6d2ef6f7c1c4ebd71bc271539
Jungshik Jang [Tue, 5 Aug 2014 08:35:31 +0000 (08:35 +0000)]
Merge "Refine recode apis." into lmp-dev
Jungshik Jang [Tue, 5 Aug 2014 07:10:21 +0000 (16:10 +0900)]
Fix bugs on timer recording action.
1. Apply masking to feature abort of SetXXXTimer
2. Announce error when failed to send SetXXXTimer.
3. Remove TimerRecordingAction when deivce is disabled.
4. Report clear timer record error thru onClearTimerRecordingResult.
Change-Id: Id243aa25481dad57509b4229ca214fa9b6b00fdc
Jungshik Jang [Tue, 5 Aug 2014 05:43:24 +0000 (14:43 +0900)]
Refine recode apis.
1. add return type, int, to toByteArray method so
that caller can know how many of bytes it consumes.
2. put final keyword
Change-Id: Ia942016fa35ecb04b49be51170739101644c3e31
Jungshik Jang [Tue, 5 Aug 2014 05:28:39 +0000 (05:28 +0000)]
Merge "Fix invalid annotation, @throw" into lmp-dev
Jungshik Jang [Tue, 5 Aug 2014 05:27:17 +0000 (14:27 +0900)]
Fix invalid annotation, @throw
Change-Id: Id22635414567a8b525032df792f2309102d7ae62
Wonsik Kim [Tue, 5 Aug 2014 04:47:48 +0000 (04:47 +0000)]
Merge "TIF: implement setVolume for hardware inputs" into lmp-dev
Jinsuk Kim [Fri, 1 Aug 2014 10:13:53 +0000 (19:13 +0900)]
Plumbing for HdmiTvClient and HdmiControlService
Added a few more methods in HdmiTvClient to use the API provided
by HdmiControlService
Change-Id: Ib506699b9661b99cefc837b96ac64347a4e9420c
Yuncheol Heo [Mon, 4 Aug 2014 10:41:09 +0000 (19:41 +0900)]
Let STB oneTouchPlay on SCREEN_ON event.
- Eleborate the reason code to initiate the initialization.
Bug:
16668375
Change-Id: I4ce657a9438e4f7baa7df2eaa102eb1ce1a7bccb
Wonsik Kim [Mon, 4 Aug 2014 01:17:18 +0000 (10:17 +0900)]
TIF: implement setVolume for hardware inputs
Bug:
16635576
Change-Id: Ibba9f32b22451d9792b5e74c2cf36cab356e4ab1
Jungshik Jang [Tue, 5 Aug 2014 00:33:27 +0000 (00:33 +0000)]
Merge "Implement clear timer." into lmp-dev
Jungshik Jang [Fri, 25 Jul 2014 04:41:14 +0000 (13:41 +0900)]
Implement clear timer.
This change implements clear timer, which sends
<Clear xxx Timer> to recorder, and reponse of it,
<Timer Cleared Status>.
Along with it, add result parser for [Timer Status Data].
Bug:
16160962
Change-Id: I1f48ec055aa93dc836156525de8b7ef921aad8b5
Shriram Ganesh [Mon, 21 Jul 2014 21:06:53 +0000 (14:06 -0700)]
Add changes for LTE to IWLAN Handover Notifications for an IMS Call
Change-Id: I6847ba1660df81d8d2ba610e9b27638800f71f77
Sungsoo Lim [Wed, 6 Aug 2014 00:28:39 +0000 (00:28 +0000)]
Merge "TIF: Add content ratings for France" into lmp-dev
Sungsoo Lim [Mon, 4 Aug 2014 06:19:00 +0000 (15:19 +0900)]
TIF: Add content ratings for France
Change-Id: Ib90a9ab918a6a7187a05323fe0f0122ffe747add
Dongwon Kang [Wed, 6 Aug 2014 00:25:37 +0000 (00:25 +0000)]
Merge "TIF: Rearchitecting TvInputPassthroughWrapperService." into lmp-dev
Dongwon Kang [Tue, 5 Aug 2014 08:08:01 +0000 (08:08 +0000)]
Merge "TIF: make the documentation consistent." into lmp-dev
Dongwon Kang [Tue, 5 Aug 2014 06:13:15 +0000 (15:13 +0900)]
TIF: make the documentation consistent.
Change-Id: Iaf93c8753c43fa128b464cea3f63a38fb7b3c8b3
Tadashi G. Takaoka [Tue, 5 Aug 2014 07:42:02 +0000 (07:42 +0000)]
Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev
Tadashi G. Takaoka [Tue, 5 Aug 2014 06:29:17 +0000 (15:29 +0900)]
Fix unnecessarily non-static inner class to static inner
Change-Id: I0c8efda6ef0bede6b5871cd651f42db82dbfbd39
Wonsik Kim [Tue, 5 Aug 2014 07:31:02 +0000 (07:31 +0000)]
Merge "TIF: fix JTvInputHal::removeStream issue" into lmp-dev
Wonsik Kim [Tue, 5 Aug 2014 06:35:07 +0000 (15:35 +0900)]
TIF: fix JTvInputHal::removeStream issue
Bug:
16803334
Change-Id: I3f92a12479cdded7a3bf572cc59e68367a0797ad
Jason Monk [Mon, 4 Aug 2014 20:28:09 +0000 (16:28 -0400)]
When exiting lock task require authentication
When exiting lock task with screen locking on make sure to notify
that the credentials need to be entered again.
Bug:
16496374
Change-Id: I891a8a8a04a67aa70eba8ea78bd585ad0dd17808
Craig Mautner [Tue, 5 Aug 2014 23:05:41 +0000 (23:05 +0000)]
Merge "Don't dismiss boot messages before keyguard is ready" into lmp-dev
Craig Mautner [Tue, 5 Aug 2014 22:16:01 +0000 (15:16 -0700)]
Don't dismiss boot messages before keyguard is ready
Or you will expose the home screen.
Fixes bug
16371571.
Change-Id: Ib38a583189c570b44910548a9544b1e81c831119
Jorim Jaggi [Tue, 5 Aug 2014 21:12:40 +0000 (23:12 +0200)]
Allow closing the whole panel when QS is open
If the user drags below the notifications, we close everything. Only
implemented for the SHADE, and not on Keyguard because of
time constraints.
Bug:
15414856
Change-Id: I4cf656484bc1217d552211c2bfdd7598eb52dad7
Jorim Jaggi [Tue, 5 Aug 2014 20:03:07 +0000 (22:03 +0200)]
Edge swipes should also dismiss notifications
To prevent falsing with phone/camera affordance.
Bug:
16571057
Change-Id: I5da5efc5529af8211357b556f1db4858e8775e05
Michael Wright [Wed, 30 Jul 2014 17:49:21 +0000 (10:49 -0700)]
Mark all Meta combos as system combos
Also make a meta-tab a recents accelerator.
Bug:
14066931
Change-Id: Iac6aab276e4e16d5f70c92a5a03172bd81559afa
John Spurlock [Tue, 5 Aug 2014 22:52:29 +0000 (22:52 +0000)]
Merge "AudioService: getMasterStreamType -> RING on tablets." into lmp-dev
Chris Craik [Tue, 5 Aug 2014 22:31:52 +0000 (15:31 -0700)]
Fix large radius RR clipping issue on certain devices
bug:
16804363
Since dist can be in the 1000s of pixels, and length() may square it
in its current precision, scale the value down significantly first,
since final precision isn't very important.
Change-Id: Id20f7a49d6171355c8e242442c2b5083f746dca3
John Spurlock [Tue, 5 Aug 2014 17:28:33 +0000 (13:28 -0400)]
AudioService: getMasterStreamType -> RING on tablets.
Since all service-internal checks use stream alias, and the alias
for NOTIFICATION is RING, even on tablets.
This is a followup to ag/506532.
Ensure that #getMasterStreamType always follows the stream_system
alias, and update the system alias for tablets per the new policy.
Update the associate javadoc comment in AudioManager to make this
clear.
Note: there is now no difference in the alias maps between phones
and tablets.
Also fix a condition affected by this in VolumePanel.
Bug:
16626879
Change-Id: I2700a48d2a3e7703607f771a1ab7f325596fd789
Amith Yamasani [Tue, 5 Aug 2014 23:04:21 +0000 (23:04 +0000)]
Merge "Allow phone UID to export singleton providers" into lmp-dev
Amith Yamasani [Tue, 5 Aug 2014 18:15:05 +0000 (11:15 -0700)]
Allow phone UID to export singleton providers
Also add a user variant of replacePreferredActivity for use
by SmsApplication.
Map user restrictions for SMS/MMS to AppOps perms.
Bug:
16681533
Change-Id: I3dfed5fc754e33bb51c6f571851653a7c2770e46
Sandeep Siddhartha [Tue, 5 Aug 2014 22:29:07 +0000 (22:29 +0000)]
Merge "Use @IntDef for manage actions" into lmp-dev
Sandeep Siddhartha [Mon, 4 Aug 2014 17:42:09 +0000 (10:42 -0700)]
Use @IntDef for manage actions
Change-Id: I12473fb82bf865af36aaf681a1b12a19e9f218fc
Svetoslav [Tue, 5 Aug 2014 22:18:11 +0000 (22:18 +0000)]
Merge "Fix build" into lmp-dev
Svetoslav [Tue, 5 Aug 2014 22:17:49 +0000 (15:17 -0700)]
Fix build
Change-Id: I96eec52472bec122074b0ec2ee051c1b55eaa8f4
Brian Carlstrom [Wed, 18 Jun 2014 22:11:01 +0000 (15:11 -0700)]
Switch from core to core-libart
Bug:
14298175
(cherry picked from commit
dbcae5ceb766b0bc65fa819841f9bfab9ae11c2f)
Change-Id: I982d02184b7bfdd14f447e2761fe5d058c53489b
Hui Shu [Tue, 5 Aug 2014 21:34:48 +0000 (14:34 -0700)]
DO NOT MERGE: Revert "Update makefile for clang host build."
This CL is somehow merged to lmp-dev and breaking Mac builds.
This reverts commit
132ed0f2b45acf982bbd06616f14164b612661d1.
Change-Id: I5a3472c0e2924db5c605340d7abdd407b956dcc2