Zoltan Szatmary-Ban
0f5efe0b44
Merge "Update Trusted Credentials screen in settings" into lmp-dev
2014-08-05 00:19:02 +00:00
Adrian Roos
04e5f72cdb
Merge "Update User switcher to new spec, implement adding users" into lmp-dev
2014-08-07 09:28:12 +00:00
Adrian Roos
ccdff62159
Update User switcher to new spec, implement adding users
...
Also enforces restrictions on when guests can be added.
Bug: 15545213
Change-Id: Ia03747fbcc39f2b1b20876463c85afbac5057878
2014-08-06 18:00:32 +02:00
Santos Cordon
7c7bc7f691
Add setConferenceable() API from ConnectionService to incall. (1/4)
...
Change-Id: I64fdca08d35f893d755e3b154543a261b1418343
2014-08-06 03:36:09 -07:00
Robin Lee
2e7cf64842
Merge "Permit crash report button for user profiles" into lmp-dev
2014-08-05 00:35:13 +00:00
Robin Lee
cead2839a5
Permit crash report button for user profiles
...
Loosens the restriction for reporting an issue with an app from "same
profile" to "same user".
Fixes bug 16792315.
Change-Id: I25100a3f7030b2a74e9fe40894103677e8db6cdd
2014-08-07 10:11:02 +00:00
Ji-Hwan Lee
956afc2ba7
TIF: Handle setMainSession for TV input wrapper services
...
Bug: 15994065
Change-Id: I46b3c0a89be92036f2c3849a412075caf587ec5c
2014-08-07 10:05:30 +00:00
Esteban Talavera
00f201e41b
Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev
2014-08-05 00:35:13 +00:00
Robin Lee
faa4b3cb06
Disallow switching managed profile to foreground
...
Another check in the ActivityManager to stop us from getting into an
invalid state by a fat-fingered 'am switch' etc.
@bug 16814252
Change-Id: Id65ab647d5a535cc2f965139a1b717cf65aa7e69
2014-08-07 10:15:45 +01:00
Yuncheol Heo
7dea98f6f9
Allow to use device's own physical address.
...
- Fixed JavaDoc.
Change-Id: I6fdbf6596b5f2e41a238b36e128ba0889725c813
2014-08-07 17:58:59 +09:00
Yuncheol Heo
2849b7ccd1
Go to nap when receiving <Active Source> for the other devices.
...
- Previously, it went to sleep when it got <Active Source>, but this
causes the other side-effects like can't-wake-up when changing to HDMI
port directly.
Bug: 15578870
Change-Id: I0ca5bd2372c9e5e7446592d66483900eeba75500
2014-08-07 17:30:08 +09:00
Terry Heo
df9f0a321e
TIF: Add system API 'isSingleSessionActive()'
...
Bug: 16498558
Change-Id: I4f815f431051dbf786216d2b04e9737be451a508
2014-08-07 08:07:17 +00:00
Brian Carlstrom
ce5bbbea08
Move image classes options from art to AndroidRuntime [frameworks/base]
...
Bug: 15165413
(cherry picked from commit 108166c749f0418d45f220419a9611c4afec1311)
Change-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa
2014-08-06 22:25:01 -07:00
Brian Carlstrom
0d8fb01963
Disable compilation based on vold.decrypt. [frameworks/base]
...
Bug: 15165413
(cherry picked from commit 4fd561637a173c7fa6a1d71e9115db1db90514ff)
Change-Id: I2a13b63f9d4a7ffd69a8d21666c6dce84739c6ed
2014-08-06 22:25:01 -07:00
Brian Carlstrom
3fbfbb4ade
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
(cherry picked from commit f60d3a4702f6d00d7edb5d348c53b9b03ae16b76)
Change-Id: I293c81ba817e9abbf9c05b3fb554ef2f0ad0c4ed
2014-08-06 22:25:00 -07:00
Alex Light
a25dc2bbe7
resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
...
Change-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d
(cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)
2014-08-06 22:25:00 -07:00
Esteban Talavera
fe0f24cc92
Wipe only managed profile when max number of incorrect passwords exceeded
...
When the maximum number of retries that has been exceeded is not for the primary profile of the user, wipe only the profile that set that policy (e.g. the managed profile) rather than the entire user. At the moment the whole device is wiped if the max number of incorrect passwords for a managed profile is reached, as the password is shared with the USER_OWNER.
Bug: 14453697
Change-Id: I5746de104133c0ea0a51d75b9c92e1516d365d8c
2014-08-06 18:10:16 +01:00
Sungsoo Lim
022e7cc298
Merge "TIF: Add content ratings for Australia" into lmp-dev
2014-08-04 23:56:40 +00:00
Sungsoo Lim
1fd38bd996
TIF: Add content ratings for Australia
...
Reference: http://www.classification.gov.au/
Change-Id: I79a85124df7e06418ff95ca39ef1db98a83c5af1
2014-08-06 15:11:26 +09:00
Youngsang Cho
ac8c3d3358
Merge "Remove a Handler constructor parameter Looper in TIS" into lmp-dev
2014-08-05 00:07:36 +00:00
Youngsang Cho
3d13aec546
Remove a Handler constructor parameter Looper in TIS
...
getMainLooper() returns null in the variable initialization phase.
Change-Id: Iebe52eac8955c0a8394501575f90ff6f2825451c
2014-08-06 15:44:35 +09:00
Youngsang Cho
ff04ae757a
Add a method in TIS to relayout SurfaceView
...
Bug: 15389458
Change-Id: I7f740141e7cf59fea5d321099652e65bc9e5f7d1
2014-08-06 14:53:28 +09:00
Jungshik Jang
d57ba99a5a
Merge "More tweaks for recording" into lmp-dev
2014-08-05 00:07:36 +00:00
Brian Carlstrom
40c89a087b
Remove java.lang.reflect.ArtMethod accidentally added in ad601d76e820ba680b14b7016d2e79763b7f4663
...
Change-Id: Ib01118d950e7cfe91c87a34489c51777262125bf
2014-08-05 21:09:29 -07:00
Jungshik Jang
e9e0f070e3
More tweaks for recording
...
1. Mask TimerClearedStatus message result.
2. Use proper mask for media info.
Change-Id: I7ed6f6839c333460a7bef5e5a84af2a9a34c6d97
2014-08-05 18:03:03 +09:00
Youngsang Cho
887ad97ebe
Merge "Add a method in TIS to relayout SurfaceView" into lmp-dev
2014-08-05 00:03:09 +00:00
Jae Seo
9551e92507
TIF: Add explanation for TvView
...
Bug: 16801733
Change-Id: I8fa81a850d1e29f32fdb6caa4bd3dc4b2668e18a
2014-08-05 23:09:13 -07:00
Dongwon Kang
65dc05248e
Merge "TIF: Add content rating system for Spain" into lmp-dev
2014-08-05 00:03:09 +00:00
Dongwon Kang
b1caf4d817
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
2014-08-06 11:48:45 +09:00
Aravind Akella
99fe165082
Sensor related changes for NDK.
...
i) Add ASensor_isWakeUpSensor and ASensorManager_getDefaultSensorEx
methods.
Bug: 16399898
Change-Id: Icc252aad068fa337bef8b22f20584f98cd5a155d
2014-08-05 19:34:04 -07:00
Dongwon Kang
66b9e91801
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
2014-08-06 11:15:30 +09:00
Michael Wright
3f145a2f95
Add supported refresh rate to displays
...
Change-Id: I51231dd6dd231d57dd1ac499349d6335121f07d5
2014-08-06 02:03:49 +00:00
Wonsik Kim
06c41a3e7f
TIF: TvInputHardwareManager to listen to audio port changes
...
Bug: 16758816
Change-Id: I0c7ace661de1911a53f57e22898eccd7cca7a07d
2014-08-06 10:56:03 +09:00
Ihab Awad
5d0410fa7c
Finalize implementation of Remote Connection Service (1/4)
...
Change-Id: I3788c9ab03a979f22ab628637adf6d520038cb6e
2014-08-05 18:21:26 -07:00
Youngsang Cho
55a684a82d
Merge "Add system APIs to set Z-order of TvView" into lmp-dev
2014-08-05 00:07:36 +00:00
Youngsang Cho
bf0a4eb158
Add system APIs to set Z-order of TvView
...
Bug: 16723028
Change-Id: I43c840ca2065920360859f8814a0c76ab2937ac1
2014-08-06 10:01:08 +09:00
Jeff Sharkey
fa5ec770ec
Use system collator for display names.
...
Continue sorting directory names first, but use system collator in
case-insensitive ordering.
Bug: 13545569
Change-Id: I24b314c9ef42f397bc96f474d9593bdefc0061d1
2014-08-06 00:56:45 +00:00
Adam Powell
11a6ddbb6e
Merge "Fall-through for ActionModes with ToolbarActionBar" into lmp-dev
2014-08-05 00:15:52 +00:00
Adam Powell
1dcedbac34
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
2014-08-05 16:38:53 -07:00
Chris Craik
e4cf152cb7
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
2014-08-05 18:01:53 +00:00
Jeff Sharkey
f174c6e6de
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
2014-08-05 17:46:05 +00:00
Shishir Agrawal
d3541e5b86
Merge "Return APDU status code on tramsit channel command failure." into lmp-dev
2014-08-05 00:34:22 +00:00
Winson Chung
cdcd487aba
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
2014-08-06 01:02:15 +00:00
Shishir Agrawal
43d94347a6
Return APDU status code on tramsit channel command failure.
...
Change-Id: I2d506a6ddbb4e27a04f57941247924d36c9d279b
2014-08-05 17:06:51 -07:00
Michael Wright
46db93404b
Ensure backup schedule file is closed.
...
Change-Id: Ie4a62cda74815c67c62fb08e8df25a71d6102d4c
2014-08-05 19:58:27 +00:00
Eric Laurent
40b8ef99a5
Merge "SoundTrigger API update." into lmp-dev
2014-08-05 00:34:22 +00:00
ztenghui
af8a8f3a7d
Update the system linear progress bar
...
bug:14622065
Change-Id: Ic08022d934763ba0cc6067af3e50c4afeb8a0e9e
2014-08-05 19:46:36 +00:00
Jorim Jaggi
488b792eee
Fix not being able to dismiss panel with single tap
...
Bug: 16562847
Change-Id: Ic409b9dd23df7e79a20b83a8a63eaaf1f76b3dd0
2014-08-05 19:26:13 +00:00
Jorim Jaggi
dd5b88684d
Navbar scrim when in QS
...
Bug: 16644711
Change-Id: I91d823671919068500a29878f3dfe9b481000a58
2014-08-05 19:22:53 +00:00
Craig Mautner
1c8eb5e3d0
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
2014-08-05 19:11:59 +00:00