147014 Commits

Author SHA1 Message Date
Hector Dearman
24f7e61a38 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
2014-08-05 10:55:30 +01:00
Sungsoo Lim
8811f3457e Merge "TIF: Add content ratings for Netherlands" into lmp-dev 2014-08-05 00:07:36 +00:00
Sungsoo Lim
3596a9645e TIF: Add content ratings for Netherlands
Change-Id: I17bac9587ea549f5e22bfe9c03fa50999fee5d5f
2014-08-06 09:26:50 +09:00
David Christie
db54e3c6c8 Merge "Fix issue where FlpHardwareProvider can crash if GmsCore re-registers a sink." into lmp-dev 2014-08-05 00:29:22 +00:00
David Christie
daf35c3136 Fix issue where FlpHardwareProvider can crash if GmsCore re-registers a sink.
Change-Id: If6f4e9bc3c5be6ca537de2dae1fddd6351350e9e
2014-08-05 14:42:37 -07:00
Sungsoo Lim
2df7e30839 Merge "TIF: Remove countryCode in TvContentRating" into lmp-dev 2014-08-05 00:07:36 +00:00
Jorim Jaggi
1328569d33 Fix more card on Keyguard overflow.
Bug: 15719165
Change-Id: Ie1e99dd722d7fcd52c0ce2eda968885835004b2b
2014-08-05 23:37:31 +00:00
Jorim Jaggi
5eb4c19043 Fix pressed state when long pressing nav bar buttons
Bug: 16018025

Change-Id: Ic2bc96feae8a68e471fe902ae05611719ecf8dad
2014-08-05 23:13:40 +00:00
Sungsoo Lim
f128dbf076 Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev 2014-08-05 00:03:09 +00:00
Sungsoo Lim
e6dca2cfa4 TIF: A preliminary CL to add multiple rating systems
TODO: Add rating systems for the countries defined in this CL.

Change-Id: I128284fd8779723b5ffb5968e2a11ce4b4eae6b5
2014-08-05 17:35:38 +09:00
Sungsoo Lim
39ddf8ddc4 Merge "TIF: Add content ratings for Germany" into lmp-dev 2014-08-05 00:03:09 +00:00
Sungsoo Lim
6b444eed2c TIF: Add content ratings for Germany
Change-Id: I7233e5d10550d6e6d2ef6f7c1c4ebd71bc271539
2014-08-06 09:29:58 +09:00
Jungshik Jang
3611051054 Merge "Refine recode apis." into lmp-dev 2014-08-05 00:03:09 +00:00
Jungshik Jang
faa49bc896 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
2014-08-05 17:24:39 +09:00
Jungshik Jang
2afd97698d 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
2014-08-05 14:46:05 +09:00
Jungshik Jang
363c4efa51 Merge "Fix invalid annotation, @throw" into lmp-dev 2014-08-05 00:07:36 +00:00
Jungshik Jang
f406cc3442 Fix invalid annotation, @throw
Change-Id: Id22635414567a8b525032df792f2309102d7ae62
2014-08-05 14:27:17 +09:00
Wonsik Kim
ee3166e0d5 Merge "TIF: implement setVolume for hardware inputs" into lmp-dev 2014-08-05 00:07:36 +00:00
Jinsuk Kim
6ffb03816f Plumbing for HdmiTvClient and HdmiControlService
Added a few more methods in HdmiTvClient to use the API provided
by HdmiControlService

Change-Id: Ib506699b9661b99cefc837b96ac64347a4e9420c
2014-08-05 13:05:49 +09:00
Yuncheol Heo
fc44e4e03c Let STB oneTouchPlay on SCREEN_ON event.
- Eleborate the reason code to initiate the initialization.

Bug: 16668375
Change-Id: I4ce657a9438e4f7baa7df2eaa102eb1ce1a7bccb
2014-08-05 11:15:59 +09:00
Wonsik Kim
8e45a33ca8 TIF: implement setVolume for hardware inputs
Bug: 16635576
Change-Id: Ibba9f32b22451d9792b5e74c2cf36cab356e4ab1
2014-08-05 10:33:08 +09:00
Jungshik Jang
4f9e21ee32 Merge "Implement clear timer." into lmp-dev 2014-08-04 23:56:40 +00:00
Jungshik Jang
e5a9337ebe 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
2014-08-05 09:32:34 +09:00
Shriram Ganesh
af9a696b20 Add changes for LTE to IWLAN Handover Notifications for an IMS Call
Change-Id: I6847ba1660df81d8d2ba610e9b27638800f71f77
2014-08-04 23:57:51 +00:00
Sungsoo Lim
f0bcee493d Merge "TIF: Add content ratings for France" into lmp-dev 2014-08-04 23:56:40 +00:00
Sungsoo Lim
4acc7c3f4e TIF: Add content ratings for France
Change-Id: Ib90a9ab918a6a7187a05323fe0f0122ffe747add
2014-08-06 09:00:53 +09:00
Dongwon Kang
e377ea5de6 Merge "TIF: Rearchitecting TvInputPassthroughWrapperService." into lmp-dev 2014-08-05 00:07:36 +00:00
Dongwon Kang
307a8ba9f0 Merge "TIF: make the documentation consistent." into lmp-dev 2014-08-04 23:56:40 +00:00
Dongwon Kang
1f81b1040f TIF: make the documentation consistent.
Change-Id: Iaf93c8753c43fa128b464cea3f63a38fb7b3c8b3
2014-08-05 15:49:43 +09:00
Tadashi G. Takaoka
0081e911a2 Merge "Fix unnecessarily non-static inner class to static inner" into lmp-dev 2014-08-04 23:56:40 +00:00
Tadashi G. Takaoka
8c6d477d30 Fix unnecessarily non-static inner class to static inner
Change-Id: I0c8efda6ef0bede6b5871cd651f42db82dbfbd39
2014-08-05 07:31:22 +00:00
Wonsik Kim
a08c1f6af4 Merge "TIF: fix JTvInputHal::removeStream issue" into lmp-dev 2014-08-04 23:56:40 +00:00
Wonsik Kim
b82de3600f TIF: fix JTvInputHal::removeStream issue
Bug: 16803334
Change-Id: I3f92a12479cdded7a3bf572cc59e68367a0797ad
2014-08-05 07:30:51 +00:00
Jason Monk
e069779dea 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
2014-08-04 23:50:06 +00:00
Craig Mautner
acf93fefb1 Merge "Don't dismiss boot messages before keyguard is ready" into lmp-dev 2014-08-04 23:47:20 +00:00
Craig Mautner
a631d49e05 Don't dismiss boot messages before keyguard is ready
Or you will expose the home screen.

Fixes bug 16371571.

Change-Id: Ib38a583189c570b44910548a9544b1e81c831119
2014-08-05 23:04:42 +00:00
Jorim Jaggi
e0640dd524 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
2014-08-05 23:01:56 +00:00
Jorim Jaggi
28f0e59329 Edge swipes should also dismiss notifications
To prevent falsing with phone/camera affordance.

Bug: 16571057
Change-Id: I5da5efc5529af8211357b556f1db4858e8775e05
2014-08-05 23:01:34 +00:00
Michael Wright
ce0c13a169 Mark all Meta combos as system combos
Also make a meta-tab a recents accelerator.

Bug: 14066931
Change-Id: Iac6aab276e4e16d5f70c92a5a03172bd81559afa
2014-08-05 23:01:15 +00:00
John Spurlock
5f72e16847 Merge "AudioService: getMasterStreamType -> RING on tablets." into lmp-dev 2014-08-05 00:35:13 +00:00
Chris Craik
f99f320dc7 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
2014-08-05 22:39:31 +00:00
John Spurlock
4f0f120316 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
2014-08-05 16:23:14 -04:00
Amith Yamasani
f17e498fea Merge "Allow phone UID to export singleton providers" into lmp-dev 2014-08-05 00:19:02 +00:00
Amith Yamasani
41c1ded7f0 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
2014-08-05 14:37:27 -07:00
Sandeep Siddhartha
3962aa5d40 Merge "Use @IntDef for manage actions" into lmp-dev 2014-08-04 23:48:34 +00:00
Sandeep Siddhartha
0db30899f0 Use @IntDef for manage actions
Change-Id: I12473fb82bf865af36aaf681a1b12a19e9f218fc
2014-08-05 13:07:06 -07:00
Svetoslav
f5997badd8 Merge "Fix build" into lmp-dev 2014-08-04 23:48:34 +00:00
Svetoslav
4f6a6c48a4 Fix build
Change-Id: I96eec52472bec122074b0ec2ee051c1b55eaa8f4
2014-08-05 15:17:49 -07:00
Brian Carlstrom
eaeae259fa Switch from core to core-libart
Bug: 14298175

(cherry picked from commit dbcae5ceb766b0bc65fa819841f9bfab9ae11c2f)

Change-Id: I982d02184b7bfdd14f447e2761fe5d058c53489b
2014-08-05 15:01:01 -07:00
Hui Shu
eb8ac25fe5 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
2014-08-05 21:38:03 +00:00