OSDN Git Service
Selim Cinek [Fri, 4 Dec 2015 23:51:16 +0000 (15:51 -0800)]
Fixed a bug where groups were layouted too small
If the group was a group of custom views it
was layouted too small.
Change-Id: I88778c9a162e6f3012140d1e7864d66f13da2b1d
Selim Cinek [Fri, 4 Dec 2015 21:04:22 +0000 (13:04 -0800)]
Fixed a small measuring but with the notification header
Change-Id: I64e3504516110f245624b037e534d208d57d8250
Selim Cinek [Fri, 4 Dec 2015 19:35:50 +0000 (11:35 -0800)]
Fixed a bug where legacy icons where incorrectly colored
Because we were unconditionally applying the color when
set to dark
Change-Id: I4321a81fcd0f04f921752a5dcb8c3cbd47af36b7
Selim Cinek [Wed, 2 Dec 2015 23:51:10 +0000 (15:51 -0800)]
Removed duplicate content from group notification header
Previously the headers all had duplicate content, which is
now optimized to look visually more appealing.
Change-Id: I38ed8db1985fd8a9470888e1b7e1e6b0f2e23b19
Filip Gruszczynski [Wed, 9 Dec 2015 00:13:42 +0000 (00:13 +0000)]
Merge "Remove Window.setDecorView API."
Tony Mak [Wed, 9 Dec 2015 00:11:53 +0000 (00:11 +0000)]
Merge "Add Email.ENTEPRISE_CONTENT_FILTER_URI"
Filip Gruszczynski [Tue, 8 Dec 2015 23:42:01 +0000 (15:42 -0800)]
Remove Window.setDecorView API.
We currently don't have a strong use case for this.
Change-Id: I106aaf1224d7934964d9b92628fd3cdd42507c46
Felipe Leme [Tue, 8 Dec 2015 23:51:38 +0000 (23:51 +0000)]
Merge "Improved test cases so they handle the initial warning."
Christopher Wiley [Tue, 8 Dec 2015 23:32:36 +0000 (23:32 +0000)]
Merge "Rethrow remote\'s ServiceSpecificException" am:
85eaca25fe
am:
b7b3415899
* commit '
b7b341589929b9d8c46f772c253803c97ac1ffb0':
Rethrow remote's ServiceSpecificException
Christopher Wiley [Tue, 8 Dec 2015 23:26:40 +0000 (23:26 +0000)]
Merge "Rethrow remote\'s ServiceSpecificException"
am:
85eaca25fe
* commit '
85eaca25fe2a89f883e9a87d8f411cfb315f3e03':
Rethrow remote's ServiceSpecificException
Christopher Wiley [Tue, 8 Dec 2015 23:15:52 +0000 (23:15 +0000)]
Merge "Rethrow remote's ServiceSpecificException"
Jeff Sharkey [Tue, 8 Dec 2015 22:29:52 +0000 (22:29 +0000)]
Merge "Shift around encryption public APIs."
Dianne Hackborn [Tue, 8 Dec 2015 22:24:38 +0000 (22:24 +0000)]
Merge "New generic background restrictions."
Jeff Sharkey [Tue, 8 Dec 2015 21:20:06 +0000 (14:20 -0700)]
Shift around encryption public APIs.
There are far too many Context APIs with special directory paths
to replicate device-encryption versions of them all. Instead, add
methods to clone a Context that explicitly stores its data in either
credential- or device-encrypted storage.
Methods to test the behavior of a given Context.
Bug:
22358539
Change-Id: I6a6290a9b282605ce9a1f82742fc2c4c50536754
Hall Liu [Tue, 8 Dec 2015 21:53:25 +0000 (21:53 +0000)]
Merge "Add extras tag for analytics support"
Xiaohui Chen [Tue, 8 Dec 2015 21:42:22 +0000 (21:42 +0000)]
Merge "UserManager: get/set user account name"
Seigo Nonaka [Tue, 8 Dec 2015 21:29:40 +0000 (21:29 +0000)]
Merge "Add Emoji "lang" attribute for NotoColorEmoji.ttf"
Dianne Hackborn [Fri, 4 Dec 2015 21:11:09 +0000 (13:11 -0800)]
New generic background restrictions.
This modifies the existing rigid background restriction to
a more moderate policy that we can (eventually) apply to all
apps:
- After N minutes no longer in the foreground, any background
services running in the app are stopped and no more can be
started.
- No manifest receivers for the application will be executed
if the broadcast is not being sent explicitly to that app and
the app is not running. (Eventually we should tighten this so
they won't be received if the app is past its N minute
background window.)
- Other non-background processes may still bind to services in
the background process, which will raise it to back to an
executing state... so things like syncs, jobs, live wallpapers,
accessibility services, etc still work.
Change-Id: I08ddbfdf640ef324a27b2eb9eecd9499f3ebddd9
Alan Viverette [Tue, 8 Dec 2015 19:49:56 +0000 (19:49 +0000)]
Merge "Attach drawable resource ID and name to getDrawable() exceptions"
Alan Viverette [Tue, 8 Dec 2015 19:49:13 +0000 (14:49 -0500)]
Attach drawable resource ID and name to getDrawable() exceptions
Wraps the entire getDrawable() method in a try/catch block. Clears the
stack trace from the re-thrown exception, since we only need the trace
from the original exception.
Also clears stack traces from re-thrown RuntimeExceptions in applyTheme
implementations.
Change-Id: I92396abf9e748eef78777174b297a09e118f5e70
Svet Ganov [Wed, 25 Nov 2015 03:10:59 +0000 (19:10 -0800)]
Ephemeral cookie API
Add APIs for an ephemeral app to set a cookie which is a small
peice of data cached longer than the app itself. This is useful
for avoiding the user to login every time they use the ephemeral
app. The cookie is stored after an ephemeral app is uninstalled.
Normal apps or ephemeral apps upgraded to full apps can also use
these APIs with the difference that once they are uninstalled
the cookie is deleted.
The cookie size defaults to 16KB and is configurable by a global
settings which can be adjusted via gservices. Also eviction policy
is time based with a default of one month and is configurable by
a global setting which can be adjusted via gservices. If the cert
of the app cahnges (when ephemeral is installed, uninstalled and
installed again) the cooke is wiped to prevent data leaks.
This cahange also adds an API for apps to know whether they run in
an ephemeral mode since it this mode some APIs will not be available.
Another API exposed by this change is private for the system and
exposes all ephemeral apps - installed and uninstalled. Only the
system can call this API. When an ephemeral app is uninstalled the
system stores its name, icon, and permissions. When the app is
reinstalled or a full version is installed the permissions are
propagated.
Change-Id: Id4a73a7750bfbabda0bfcb9bf9018d2062e94367
Chris Tate [Tue, 8 Dec 2015 18:30:48 +0000 (18:30 +0000)]
Merge "Don't leak alarm wakelock when delivery fails"
Christopher Tate [Tue, 8 Dec 2015 18:24:33 +0000 (10:24 -0800)]
Don't leak alarm wakelock when delivery fails
If an app sets an alarm and then cancels the underlying PendingIntent,
delivery will fail in such a way that the OnFinished callback is not
invoked. The Alarm Manager relies on that callback for managing
wakelock lifetime, however; this meant that the wakelock acquisition
would leak, burning down the battery.
We now detect these sorts of delivery failures and manage the
wakelock appropriately.
Bug
25864361
Change-Id: I74af48e81002b29b129c41a76c0a8329c647390d
Steve McKay [Tue, 8 Dec 2015 17:27:01 +0000 (17:27 +0000)]
Merge "Don't try to copy empty selection to clipboard."
Steve McKay [Tue, 8 Dec 2015 00:31:42 +0000 (16:31 -0800)]
Don't try to copy empty selection to clipboard.
Bug:
25374244
Change-Id: Ia33d3fda909dc59f65adcc20839563a9f5885047
Robin Lee [Tue, 8 Dec 2015 17:14:09 +0000 (17:14 +0000)]
Merge "Fix test-api.txt"
Robin Lee [Tue, 8 Dec 2015 17:10:35 +0000 (17:10 +0000)]
Fix test-api.txt
37317e7c22e89816156e6e9a7abf4c5a59e8440a Commit was generated before
test-api.txt existed.
Change-Id: Ied6ead08826c7635c7da15b91f6e30f29c575fbd
Todd Kennedy [Tue, 8 Dec 2015 17:07:15 +0000 (17:07 +0000)]
Merge "Temporarily stop proxying to cmd"
Elliott Hughes [Tue, 8 Dec 2015 16:57:57 +0000 (16:57 +0000)]
Merge "Track rename of base/ to android-base/."
Elliott Hughes [Tue, 8 Dec 2015 16:57:14 +0000 (08:57 -0800)]
Track rename of base/ to android-base/.
Change-Id: If08a94025fc12433f7e248b7787cee3c14843097
Robin Lee [Mon, 3 Aug 2015 15:21:22 +0000 (16:21 +0100)]
DevicePolicy API to remove an installed KeyPair
The keypair is specified by alias and removed via a call to the
KeyChainService, which will have installed the pair in the first place.
Bug:
22541933
Change-Id: I37317e7c22e89816156e6e9a7abf4c5a59e8440a
Jason Monk [Tue, 8 Dec 2015 16:36:58 +0000 (16:36 +0000)]
Merge "Remove visibility from tiles, make them always visible"
Jason Monk [Tue, 8 Dec 2015 14:04:23 +0000 (09:04 -0500)]
Remove visibility from tiles, make them always visible
Some tiles are statically not available on boot, etc.
based on hardware availability or settings, but most
are just always visible.
Change-Id: Ib1a45ef5b029fe710f9957cb997496dcb14f5875
Lenka Trochtova [Tue, 8 Dec 2015 15:06:24 +0000 (15:06 +0000)]
Merge "Introduce ephemeral users."
Jason Monk [Tue, 8 Dec 2015 14:55:06 +0000 (14:55 +0000)]
Merge "Working towards a better QS"
Jason Monk [Fri, 4 Dec 2015 21:36:15 +0000 (16:36 -0500)]
Working towards a better QS
Some work (mostly on the new QS only) to make things more like they
will be.
- Remove Quick Tiles
- Remove Dual Tiles
- All tiles are the same, with slightly different UI in the header
- QS tiles in the header match the beginning of QS
- handleClick is a click from QS, handleSecondaryClick is a click
from the header, but defaults to normal behavior.
- Opening a detail panel from the header opens QS and the detail
selected
- Fix onStartListening bug in CustomTile
- UI updates towards how QS will look
Change-Id: Id820586ccdaa258a5bcb72cadbeb14941fc5f935
Lenka Trochtova [Wed, 18 Nov 2015 11:22:06 +0000 (12:22 +0100)]
Introduce ephemeral users.
BUG:
24883058
Change-Id: I2e1d6aa184142c2a3dc0415c0cd407573453cf41
Paul Duffin [Tue, 8 Dec 2015 14:22:55 +0000 (14:22 +0000)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES" am:
e252149ab9 am:
ec9081a004
am:
e94e7dd181
* commit '
e94e7dd181fb1857bf7aa3b807b64d9bb231edc6':
Remove framework from LOCAL_JAVA_LIBRARIES
Paul Duffin [Tue, 8 Dec 2015 14:21:27 +0000 (14:21 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper" am:
80d5bef6f9 am:
0ec9daecc6
am:
d441dca72b
* commit '
d441dca72bfdf5cf4eb79fdd77b2fab0e4e598ff':
Follow-up to Switch to the latest version of Caliper
Paul Duffin [Tue, 8 Dec 2015 14:18:30 +0000 (06:18 -0800)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES" am:
e252149ab9
am:
ec9081a004
* commit '
ec9081a004db058bb5ada5173d65a565e2005c6d':
Remove framework from LOCAL_JAVA_LIBRARIES
Paul Duffin [Tue, 8 Dec 2015 14:17:03 +0000 (06:17 -0800)]
Merge "Follow-up to Switch to the latest version of Caliper" am:
80d5bef6f9
am:
0ec9daecc6
* commit '
0ec9daecc6129529fc6f2d66c29876eca88c492f':
Follow-up to Switch to the latest version of Caliper
Paul Duffin [Tue, 8 Dec 2015 14:11:45 +0000 (14:11 +0000)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
am:
e252149ab9
* commit '
e252149ab99a008a0a75734326755cadd5c5ee7a':
Remove framework from LOCAL_JAVA_LIBRARIES
Paul Duffin [Tue, 8 Dec 2015 14:10:09 +0000 (14:10 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper"
am:
80d5bef6f9
* commit '
80d5bef6f9da4a0eeb23c3356843351170553df6':
Follow-up to Switch to the latest version of Caliper
Paul Duffin [Tue, 8 Dec 2015 14:04:29 +0000 (14:04 +0000)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
Paul Duffin [Tue, 8 Dec 2015 14:03:10 +0000 (14:03 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper"
Paul Duffin [Tue, 8 Dec 2015 13:51:27 +0000 (13:51 +0000)]
Remove framework from LOCAL_JAVA_LIBRARIES
After previous change removed LOCAL_NO_STANDARD_LIBRARIES:=true
it is no longer necessary to explicitly add framework to
LOCAL_JAVA_LIBRARIES as it is added automatically by the build.
Change-Id: I68bf700375e34a10302f76d7463110755b815f85
Andreas Gampe [Tue, 8 Dec 2015 02:24:08 +0000 (18:24 -0800)]
Follow-up to Switch to the latest version of Caliper
Remove LOCAL_NO_STANDARD_LIBRARIES.
(cherry pick from commit
c9d6a91cd51a9b7ff00187914fe922b0d22b3d66)
Bug:
24848946
Change-Id: I19feea042c9b4823d4979f4d951476792600edbc
Neil Fuller [Tue, 8 Dec 2015 11:05:17 +0000 (03:05 -0800)]
Merge "Add ICU4J APIs for Android" am:
cb02371ca7 am:
ec1349df9c
am:
4135a54df9
* commit '
4135a54df9fc196feb76ce7364425b19647866e4':
Add ICU4J APIs for Android
Michael Wright [Tue, 8 Dec 2015 11:03:45 +0000 (03:03 -0800)]
Merge "Add support for locking the screen when the lid is closed" am:
9dc3c36c9c am:
4d9e6190b1
am:
37c8bcbcc9
* commit '
37c8bcbcc9f5098a2a7fde91a3b112abd35a85ad':
Add support for locking the screen when the lid is closed
Prashant Malani [Tue, 8 Dec 2015 11:02:16 +0000 (03:02 -0800)]
Merge "Add rotary encoder input source" into cw-e-dev am:
487f0d3d15 am:
6344cb8144 am:
3ebd5ceb90
am:
54909b8e6b
* commit '
54909b8e6b45c913081df54496423bb35bd8955c':
Add rotary encoder input source
Neil Fuller [Tue, 8 Dec 2015 10:56:41 +0000 (10:56 +0000)]
Merge "Add ICU4J APIs for Android" am:
cb02371ca7
am:
ec1349df9c
* commit '
ec1349df9c1759ca728fc637738592902f2aa44b':
Add ICU4J APIs for Android
Michael Wright [Tue, 8 Dec 2015 10:55:07 +0000 (10:55 +0000)]
Merge "Add support for locking the screen when the lid is closed" am:
9dc3c36c9c
am:
4d9e6190b1
* commit '
4d9e6190b186f1d2e1cd25defd0d6e12dd833b38':
Add support for locking the screen when the lid is closed
Neil Fuller [Tue, 8 Dec 2015 10:47:59 +0000 (10:47 +0000)]
Merge "Add ICU4J APIs for Android"
am:
cb02371ca7
* commit '
cb02371ca70a81796c75bd3bbf88478caf6ea7b7':
Add ICU4J APIs for Android
Neil Fuller [Tue, 8 Dec 2015 10:42:51 +0000 (10:42 +0000)]
Merge "Add ICU4J APIs for Android"
Zoltan Szatmary-Ban [Tue, 8 Dec 2015 10:24:08 +0000 (10:24 +0000)]
Merge "Make base user restrictions queriable for system apps"
Tony Mak [Tue, 8 Dec 2015 07:24:55 +0000 (07:24 +0000)]
Add Email.ENTEPRISE_CONTENT_FILTER_URI
Bug:
26074697
Change-Id: Ie1d595828912edf9d998eb2bcc4ba2f6388030b7
Filip Gruszczynski [Tue, 8 Dec 2015 02:40:40 +0000 (02:40 +0000)]
Merge "Fix freeform to recents animating window being cuttoff."
Filip Gruszczynski [Mon, 7 Dec 2015 23:05:49 +0000 (15:05 -0800)]
Fix freeform to recents animating window being cuttoff.
The window will appear cutoff during the animation if the window was
cropped due to stack or decor bounds before the animation started. We
need to disable the cropping (both from decor and from stack bounds)
for the duration of the animation.
Unfortunately, by disabling cropping of a freeform window to the stack
bounds, we will make it appear above the docked window during the
animation (because the animation will lift the layer). To fix this, we
need to treat the docked stack like the pinned stack and assume it's
always on top for the layering purposes.
CL also includes refactoring of mSystemDecorRect and
mLastSystemDecorRect which can be moved from WindowState to
WindowStateAnimator and made private there.
Bug:
24913782
Change-Id: Idbea99ba04e9449d0563d0c02636f8b4b63087f7
Andreas Gampe [Tue, 8 Dec 2015 02:30:21 +0000 (02:30 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper"
Andreas Gampe [Tue, 8 Dec 2015 02:29:52 +0000 (02:29 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper"
Jeff Sharkey [Tue, 8 Dec 2015 02:27:07 +0000 (02:27 +0000)]
Merge "APIs to obtain SharedPreferences paths."
Jeff Sharkey [Tue, 8 Dec 2015 02:25:19 +0000 (19:25 -0700)]
APIs to obtain SharedPreferences paths.
Needed for apps that want to migrate SharedPreferences from CE to DE
storage. Note that a device will only ever enter a CE mode with a
factory reset, so apps should only be using these APIs when they
want to migrate files to a consistent location on non-FBE devices
for simplicity.
Bug:
25503089
Change-Id: Ic846215da1617d116a048e036415ac7ad523b770
Andreas Gampe [Tue, 8 Dec 2015 02:25:10 +0000 (18:25 -0800)]
Follow-up to Switch to the latest version of Caliper
Translate ResourcesBenchmark to work with the new version of Caliper.
Bug:
24848946
Change-Id: If4a4e5da5cd14da83d093a418147ad6d12c170cc
Andreas Gampe [Tue, 8 Dec 2015 02:24:08 +0000 (18:24 -0800)]
Follow-up to Switch to the latest version of Caliper
Remove LOCAL_NO_STANDARD_LIBRARIES.
Bug:
24848946
Change-Id: I19feea042c9b4823d4979f4d951476792600edbc
Filip Gruszczynski [Mon, 7 Dec 2015 19:50:57 +0000 (11:50 -0800)]
Fix thumbnail header animations in freeform to recents.
The thumbnail header animations were constructed based on opening apps,
in this case Recents. This is obviously wrong, but used to work because
there was only one closing app in non-multi window world.
For the animation to work correctly, i.e. each thumbnail have its own
header animation, we need to correctly construct animations for either
opening apps or closing apps (depending on the transition type we are
seeing).
The CL also refactors handleAppTransition into smaller methods.
Bug:
24913782
Change-Id: I9f30a53d2f90f0628bb8c6238b2d0f35592b8f63
Filip Gruszczynski [Tue, 8 Dec 2015 02:08:09 +0000 (02:08 +0000)]
Merge "Improve debugging setup for window manager package."
Filip Gruszczynski [Mon, 7 Dec 2015 23:43:52 +0000 (15:43 -0800)]
Improve debugging setup for window manager package.
This moves debug flags to a dedicated class and also provides a
mechanism to either have fine grained tags or one common tag for easier
grepping the logcat. This mimicks the approach in activity manager
package.
Change-Id: Ie8c08b9a3d8b182335ee5547ee05d21b5933db6b
Felipe Leme [Tue, 8 Dec 2015 01:43:55 +0000 (17:43 -0800)]
Improved test cases so they handle the initial warning.
BUG:
25752530
Change-Id: I78cd8b534fd3aeeadad0a2cf6712432a2438ca5a
Prashant Malani [Tue, 8 Dec 2015 01:43:27 +0000 (01:43 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev am:
487f0d3d15 am:
6344cb8144
am:
3ebd5ceb90
* commit '
3ebd5ceb90137572262efeda12cdce4b503ddded':
Add rotary encoder input source
Prashant Malani [Tue, 8 Dec 2015 01:37:05 +0000 (01:37 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev am:
487f0d3d15
am:
6344cb8144
* commit '
6344cb8144647e4e49bc69cbf34a084ca7712115':
Add rotary encoder input source
Jeff Sharkey [Tue, 8 Dec 2015 01:35:28 +0000 (01:35 +0000)]
Merge "Mount storage after unlock, fix leaving emulation."
Prashant Malani [Tue, 8 Dec 2015 01:31:31 +0000 (01:31 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev
am:
487f0d3d15
* commit '
487f0d3d1556296ef53c449d7ec5de5a0dac1f83':
Add rotary encoder input source
Prashant Malani [Tue, 8 Dec 2015 01:27:18 +0000 (01:27 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev
Jorim Jaggi [Tue, 8 Dec 2015 01:15:16 +0000 (17:15 -0800)]
Reset recents translation when launching
So we don't end up with empty content after having cancelled
the drag in gesture.
Change-Id: If00c526806816df58c751cd715e0575dbb7adf17
Jeff Sharkey [Mon, 7 Dec 2015 22:35:42 +0000 (15:35 -0700)]
Mount storage after unlock, fix leaving emulation.
Delay mounting of storage devices until after the user is unlocked,
which means any emulated storage areas will be ready for use. Track
separate per-user unlocked states for local versus system lifecycle
state.
Switch to explicitly lock or unlock user keys during boot of a
device without native FBE support. This allows us to recover when
the user has disabled emulated FBE.
Force reboot when changing FBE emulation state.
Bug:
26010607,
26027473
Change-Id: Idaf8b63e69f886ddbd848a9fab6d143a5fd10500
Chris Craik [Tue, 8 Dec 2015 00:55:26 +0000 (00:55 +0000)]
Merge "Build hwui test scenes as common test code"
Chris Craik [Mon, 7 Dec 2015 18:01:38 +0000 (10:01 -0800)]
Build hwui test scenes as common test code
And start using them in other non-macrobench tests
Change-Id: If155b531f3c89f97491001c06d1996df527b9f85
Dianne Hackborn [Tue, 8 Dec 2015 00:37:43 +0000 (00:37 +0000)]
Merge "Fix issue #
25656837: Static initialization order bug in ArrayMap leading to NPEs"
Fyodor Kupolov [Tue, 8 Dec 2015 00:35:53 +0000 (00:35 +0000)]
Merge "Fix locking error when a new user is created"
Chenjie Luo [Tue, 8 Dec 2015 00:02:55 +0000 (00:02 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am:
e56f7b0d1d am:
bef0525c38 am:
e4db3f0757
am:
d7b61ca662
* commit '
d7b61ca6620565cad00de91284ecdfb93ddfbd50':
Check NPE beforehand instead of catching it at runtime
Samuel Tan [Tue, 8 Dec 2015 00:00:45 +0000 (00:00 +0000)]
Merge "Add support for reading and writing double array values" am:
61c0b7cd4d am:
ff8ef28e73
am:
e769f25fa4
* commit '
e769f25fa496827bf1ba9d74518bafd40082ceb6':
Add support for reading and writing double array values
Paul Duffin [Mon, 7 Dec 2015 23:58:26 +0000 (23:58 +0000)]
Merge "Switch to the latest version of Caliper" am:
ae119af517 am:
5e2d958157
am:
2a56ed70b1
* commit '
2a56ed70b1e40039a532e4060074d62062713fcd':
Switch to the latest version of Caliper
Amit Mahajan [Mon, 7 Dec 2015 23:51:52 +0000 (23:51 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev am:
cd2cc9aa9b am:
d515b124f7
am:
0dfeda60c0
* commit '
0dfeda60c06c7bdbb4fde197e50a4c46f4024bd7':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
Julia Reynolds [Mon, 7 Dec 2015 23:50:14 +0000 (23:50 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev am:
dde5a6ef28 am:
5ff55cec79
am:
bfa2be0f58
* commit '
bfa2be0f583e149dab8891dfe9322debaa46f6e6':
Fix radio button flash on hour change.
Adam Lesinski [Mon, 7 Dec 2015 23:43:03 +0000 (23:43 +0000)]
Merge "Specify private resource package in Android.mk"
Chenjie Luo [Mon, 7 Dec 2015 23:42:07 +0000 (23:42 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am:
e56f7b0d1d am:
bef0525c38
am:
e4db3f0757
* commit '
e4db3f0757fccdf26d98ab4295ac4828a479e8eb':
Check NPE beforehand instead of catching it at runtime
Samuel Tan [Mon, 7 Dec 2015 23:38:14 +0000 (23:38 +0000)]
Merge "Add support for reading and writing double array values" am:
61c0b7cd4d
am:
ff8ef28e73
* commit '
ff8ef28e73c0959a4993fea975d0bdefbc27a20b':
Add support for reading and writing double array values
Paul Duffin [Mon, 7 Dec 2015 23:35:20 +0000 (23:35 +0000)]
Merge "Switch to the latest version of Caliper" am:
ae119af517
am:
5e2d958157
* commit '
5e2d958157d8043d5a7aca1263af2186fdf17e6c':
Switch to the latest version of Caliper
Amit Mahajan [Mon, 7 Dec 2015 23:32:22 +0000 (23:32 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev am:
cd2cc9aa9b
am:
d515b124f7
* commit '
d515b124f7f966a3e4725dc6f6179ade869df636':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
Julia Reynolds [Mon, 7 Dec 2015 23:30:22 +0000 (23:30 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev am:
dde5a6ef28
am:
5ff55cec79
* commit '
5ff55cec79b7bda67dd3e458263ccb8e2896af30':
Fix radio button flash on hour change.
Chenjie Luo [Mon, 7 Dec 2015 23:28:44 +0000 (23:28 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am:
e56f7b0d1d
am:
bef0525c38
* commit '
bef0525c385c95f4ff6710ad9b117429a4d5ce63':
Check NPE beforehand instead of catching it at runtime
Michael Wright [Mon, 7 Dec 2015 23:19:53 +0000 (23:19 +0000)]
Merge "Add support for locking the screen when the lid is closed"
am:
9dc3c36c9c
* commit '
9dc3c36c9cd796d90b65543567495d910d266e4c':
Add support for locking the screen when the lid is closed
Samuel Tan [Mon, 7 Dec 2015 23:15:15 +0000 (23:15 +0000)]
Merge "Add support for reading and writing double array values"
am:
61c0b7cd4d
* commit '
61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
Add support for reading and writing double array values
Paul Duffin [Mon, 7 Dec 2015 23:12:48 +0000 (23:12 +0000)]
Merge "Switch to the latest version of Caliper"
am:
ae119af517
* commit '
ae119af517fc427ead5bd6a3394b3b1f92df790d':
Switch to the latest version of Caliper
Fyodor Kupolov [Tue, 1 Dec 2015 01:42:43 +0000 (17:42 -0800)]
Fix locking error when a new user is created
Installer should not be called with mPackages lock held.
Bug:
25934378
Change-Id: I619af324d997dd1e4a2ac99171cb0e683c5713d1
Amit Mahajan [Mon, 7 Dec 2015 23:10:55 +0000 (23:10 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
am:
cd2cc9aa9b
* commit '
cd2cc9aa9bfdc21a06ffd7049a4b4ad07bbf6886':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
Julia Reynolds [Mon, 7 Dec 2015 23:08:01 +0000 (23:08 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
am:
dde5a6ef28
* commit '
dde5a6ef2846bfb6b253b0946a7b9e42a11b8348':
Fix radio button flash on hour change.
Chenjie Luo [Mon, 7 Dec 2015 23:06:36 +0000 (23:06 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
am:
e56f7b0d1d
* commit '
e56f7b0d1d92390c3409999ea841525514163f65':
Check NPE beforehand instead of catching it at runtime
Adam Lesinski [Mon, 7 Dec 2015 22:02:15 +0000 (14:02 -0800)]
Specify private resource package in Android.mk
Private resource package shouldn't be buried in some resource file.
It can now be specified on the command line via the Android.mk file.
Change-Id: I9e3cb0bf54830d6b021077af271913306c024701
Jeff Sharkey [Fri, 4 Dec 2015 21:49:52 +0000 (14:49 -0700)]
Better protection for system broadcast intents.
When the system sends broadcast intents, it's in a very authoritative
position, and many apps blindly trust the sender. This is why we've
historically had the concept of "protected broadcasts" which can only
be sent by the system.
However, it's far too easy to send new broadcasts from the system
without adding them to the protected list. This CL adds logic to help
catch those cases. Currently it just logs the error and continues
sending the broadcast.
Based on boot analysis of a typical device, add 36 new protected
broadcasts.
Bug:
24571095
Change-Id: Ie2cc6b0b2026e67c64730af897e4eb3e0e8404f1