drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,739 Commits 1 Branch 0 Tags
Commit Graph

170739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Sandler
9e3adb821b am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev 
* commit '4ca9d738fa3961507a0289cb4e7873701bc04e12':
  RTL support for Lollipop Land.
 2014-12-05 19:44:35 +00:00
Pavel Zhamaitsiak
b81ce34af3 Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 2014-12-05 19:42:11 +00:00
Justin Harrison
4a9cecb1f0 Merge "Add UUID for Pbap client" into lmp-mr1-dev 2014-12-05 19:41:55 +00:00
Adam Powell
1962353873 am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView" 
* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
  Fix NullPointerException in ListView
 2014-12-05 19:39:25 +00:00
Ihab Awad
710e20d225 Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev 2014-12-05 19:39:19 +00:00
Dan Sandler
4ca9d738fa Merge "RTL support for Lollipop Land." into lmp-mr1-dev 2014-12-05 19:36:39 +00:00
Fyodor Kupolov
fed2812dc9 am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev 
* commit '22afe6261aab343070b63c60a1f4c7ce6f4383f9':
  Added isRemovingAdmin method
 2014-12-05 19:36:26 +00:00
Adam Powell
b3b4f83702 am 8c9283f4: Merge "Fix NullPointerException in ListView" 
* commit '8c9283f41083a20a82ae37eac44b79de6eb3158e':
  Fix NullPointerException in ListView
 2014-12-05 19:32:13 +00:00
Eino-Ville Talvala
f4eac12954 Camera2: Add HDR scene mode for backwards compatibility. 
To maximize backwards compatibility, support the HDR scene mode fully,
as it was supported on Camera HAL1 / Camera API1.

Bug: 18639933
Change-Id: I35c164563379f7f820b42c674bd91f706061170c
 2014-12-05 11:31:08 -08:00
Fyodor Kupolov
22afe6261a Merge "Added isRemovingAdmin method" into lmp-mr1-dev 2014-12-05 19:28:12 +00:00
Adam Powell
8c9283f410 Merge "Fix NullPointerException in ListView" 2014-12-05 19:26:18 +00:00
Amith Yamasani
50734b7009 am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev 
* commit '43606641f6a2b7f31b289da4548231306f4e5156':
  Correct check of is user running
 2014-12-05 19:14:12 +00:00
Cheuksan Wang
695b5d2587 am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev 
* commit '0752da22c7ea369d28235572963aac48b66bb416':
  add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE
 2014-12-05 19:13:55 +00:00
Eino-Ville Talvala
5a5afe010d Fix docs build 
Change-Id: I9947d53aeb155d98f5194c9789f19aba1f01e4be
 2014-12-05 11:11:55 -08:00
Amith Yamasani
43606641f6 Merge "Correct check of is user running" into lmp-mr1-dev 2014-12-05 19:11:17 +00:00
Cheuksan Wang
0752da22c7 Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev 2014-12-05 19:07:10 +00:00
Adam Lesinski
e97908d32e Merge commit '0953ab27' into manualmerge 
Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
 2014-12-05 11:06:21 -08:00
Cheuksan Wang
981344861c add system|signature protection to 
android.permission.BIND_CARRIER_MESSAGING_SERVICE

Bug: 18005911
Change-Id: Iacb16a20c5cef4a55be0187af0a47e0cb82b409b
 2014-12-05 19:04:55 +00:00
ztenghui
e6672cfe6e Fine tune the light radius from 800dp to 600dp 
The spot shadow will change very slightly, as smaller and darker,
which is what UX team want.

b/18631715

Change-Id: I9ce098cf54c5875fa7bd3c20095b526ea2e661e6
 2014-12-05 11:04:22 -08:00
Sergii Skorokhodov
308fa0548b Correct check of is user running 
Before the ActivityManagerService sends an intent or
starts an activity it checks if target user is in
mStartedUsers array.

When removing a non-owner user process the
UserStartedState instance will still be in mStartedUsers
array with mState STOPPING or SHUTDOWN.

This should be checked before sending an intent or start
an activity.

isUserRunningLocked(...) will interpret mState STOPPING
and SHUTDOWN as a non running user.

Bug: 7462778
Change-Id: I1b51bcdb62bdd0f6dbe05dab4d529d4ad40d0d44
 2014-12-05 11:02:41 -08:00
Amith Yamasani
b2905092d6 am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev 
* commit '0702752cf8153f92b4d345c1553515e5f73652cd':
  Potential fix for accidental deactivation of profile owner
 2014-12-05 19:02:09 +00:00
Amith Yamasani
0702752cf8 Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev 2014-12-05 18:56:55 +00:00
Chris Wren
c11baeba20 Avoid race condition in heads up snooze code path. 
The user can still snooze the heads up as its in the process of timing
out.  In this case, mHeadsUp is already null.  We save the package
name so that we can still snooze the package.

Bug: 18639224
Change-Id: I9bcce99a5c912e70a6856b277b61adab9cdcbc33
 2014-12-05 13:53:23 -05:00
ztenghui
971fe6d664 am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev 
* commit '04c022f4c12a778027957a266dd9fce2b70a1cb0':
  AVD: Deep copy the animator target setup when mutate.
 2014-12-05 18:35:49 +00:00
ztenghui
04c022f4c1 Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev 2014-12-05 18:28:30 +00:00
Clare Bayley
fb569013c2 am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs 
* commit 'ffbb52d0807070714e4893a6ea8e4c139b85a939':
  Updating screenshots to LMP release and N6
 2014-12-05 18:10:20 +00:00
Erik Kline
e660e27603 Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev" 
This is the revert of ag/572619.

This reverts commit 9261d9d64548f0221de50eb99f3675488a4176a4, reversing
changes made to 32b61ab28f54e5b00f472b2166f9b1100375e4ff.

Bug: 18609055
Bug: 17769720
Change-Id: I122eba200f2071d4e5777ec34c1d04fb567345a8
 2014-12-05 18:02:56 +00:00
RoboErik
e9905bd489 am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev 
* commit 'f58a909113b5ebb37e57c9b88afe569e7ddec823':
  Make setting the session token in MediaBrowserService synchronous
 2014-12-05 18:01:33 +00:00
Clare Bayley
ffbb52d080 am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs 
* commit '89d30bbc110f1b511ae6e619ac02a067261ebd4d':
  Updating screenshots to LMP release and N6
 2014-12-05 18:00:43 +00:00
RoboErik
f58a909113 Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev 2014-12-05 17:57:15 +00:00
Clare Bayley
89d30bbc11 am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs 
* commit '9c40e80a5edbf2962d9a1d98152b4085e306b501':
  Updating screenshots to LMP release and N6
 2014-12-05 17:51:05 +00:00
Clare Bayley
9c40e80a5e am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs 
* commit 'c85fa8f1e291e4e0727d4e71536940fdc0896c29':
  Updating screenshots to LMP release and N6
 2014-12-05 17:38:28 +00:00
Jinsong Mu
dc6efdc1c6 Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. 
b/18568003

Change-Id: I622ca7c49a8aa712490c8f74fcd7a1ab6d2ead5f
 2014-12-05 09:36:19 -08:00
Clare Bayley
c85fa8f1e2 Merge "Updating screenshots to LMP release and N6" into lmp-docs 2014-12-05 17:29:34 +00:00
Evan Charlton
134dd68ff9 Associate a UserHandle with each PhoneAccountHandle 
This needs to be tracked so that connections get directed to the
correct user. This is not a public API; rather, it will be populated
and read only by the Telecom service.

Expose a new capability, CAPABILITY_MULTI_USER which can be used by
system-privileged apps to indicate that this PhoneAccount may be
used by any user on the device.

Bug: 17421902
Bug: 17421044
Change-Id: I673904a7ae038c88688bba62642e93174e55c308
 2014-12-05 08:55:13 -08:00
Christoph Studer
501bf216dc am 3bf7b80e: am 391232da: Merge "Log the state of the notification shade" into lmp-mr1-dev 
* commit '3bf7b80e48eb58254a076f5363f1e9e3348abb8c':
  Log the state of the notification shade
 2014-12-05 15:52:00 +00:00
Christoph Studer
ad25e3610e am 2d58c922: am 798c0552: Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev 
* commit '2d58c9220cdeaac63ae1a5c9f1c80c3e131ae296':
  NoMan: Update effect suppressor on listener remove
 2014-12-05 15:51:54 +00:00
Chris Wren
2f147f6e7a am f55ad284: am ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev 
* commit 'f55ad284448d226b047815715bb10e193c88ae0d':
  Track active notifications by key, not by reference.
 2014-12-05 15:51:48 +00:00
RoboErik
91bba40073 am 8f095396: am 7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev 
* commit '8f0953963d91a22021676cc29b0f572c1a913124':
  Tweak the behavior of the MediaSessionStack
 2014-12-05 15:51:39 +00:00
Justin Harrison
b1ab736f48 am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev 
* commit 'fdb33a08266d95c338c141446c1da09108194281':
  Revert "Improve fling physics for recents"
 2014-12-05 15:51:33 +00:00
Dan Sandler
2f6d30dfe6 am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit '7792b714b66e3af57bc243666b7843b0adf9c0b3':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-05 14:33:33 +00:00
Dan Sandler
7792b714b6 Merge "Don't forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 2014-12-05 14:27:27 +00:00
Benjamin Franz
5f1ea2e68b am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit 'fb967585cc43937a88b0ed9a5e434a50b0a498b9':
  Change the routing path of bluetooth headset connections.
 2014-12-05 12:11:23 +00:00
Benjamin Franz
fb967585cc Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 2014-12-05 12:04:03 +00:00
Justin Harrison
66351d623a am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 
* commit 'cff6d450dcef733499f584522ae1faa92940366c':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-05 07:48:27 +00:00
Justin Harrison
cff6d450dc Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 2014-12-05 07:42:59 +00:00
Raph Levien
1a7bac35da am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev 
* commit 'c8640fca7862fee5e156fa634c1cdf7853115595':
  Add 8 more scripts to the font fallback chain.
 2014-12-05 07:33:47 +00:00
Raph Levien
c8640fca78 Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev 2014-12-05 07:27:33 +00:00
Jinsuk Kim
de7a4248d8 CEC: Avoid setting op in disabled mode 
In disabled HDMI control mode, TV local device is gone, for which
setting operation is not possible. Does the check against the tv instance
when TV setting update is notified. The settings is picked up when
the control is enabled back, so notification is not lost.

Bug: 18580387
Change-Id: Id8891bfa54d851ec1aff280fc99be8e428f4e0cf
 2014-12-05 15:57:37 +09:00
Dan Sandler
e63ba4b03d Don't forget to listen for USER_ALL broadcasts. 
The ActivityManager.closeSystemDialogs() call (used by,
among other things, the home button) broadcasts
ACTION_CLOSE_SYSTEM_DIALOGS for UserHandle.USER_ALL, rather
than any one user.

Bug: 18629414
Change-Id: I89bfa3f556866e1b27987be2753ce83fd0313998
 2014-12-05 00:26:24 -05:00