Evan Charlton
59dac0e192
Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev
2014-12-06 01:45:12 +00:00
Paul Jensen
891dd5743a
Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev
2014-12-06 01:23:56 +00:00
Jeff Tinker
82cc1c5a2d
Merge "Unhide secure stop APIs" into lmp-mr1-dev
2014-12-06 00:28:26 +00:00
Jinsong Mu
b3898fbe07
Merge "Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev
2014-12-05 23:50:02 +00:00
Ihab Awad
6a1c82564f
Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev
2014-12-05 23:46:19 +00:00
Jeff Tinker
846e712dc7
Unhide secure stop APIs
...
Change-Id: If25406a6657c8f9d558e659bf5af73bac9bc434c
related-to-bug: 18053197
related-to-bug: 18076411
2014-12-05 15:44:17 -08:00
David Friedman
968ef51c67
am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs
...
* commit 'c305e6eb4aacf08001241ce18e0a86ba369fd421':
Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
2014-12-05 23:27:27 +00:00
Ihab Awad
0855e7aea2
Add Text-to-Speech annotations for phone number displays (1/3)
...
Bug: 17321294
Change-Id: Id7e48e683694e2f9ea2a7dd7fa7d69acc727489d
2014-12-05 15:27:08 -08:00
David Friedman
c305e6eb4a
am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs
...
* commit '860bdc7d5e4f5a6e065e5c66c1e25fcca7fe5f27':
Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
2014-12-05 23:20:00 +00:00
RoboErik
d386d0f391
Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev
2014-12-05 23:16:41 +00:00
David Friedman
860bdc7d5e
am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs
...
* commit 'b357f74e5163d5e4e322302055d053e99e29f60f':
Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
2014-12-05 23:12:12 +00:00
David Friedman
b357f74e51
Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs
2014-12-05 23:04:58 +00:00
Quddus Chong
52fec4707d
am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs
...
* commit 'f7b51977490f0951dead8e81bc09dae2d546ac65':
docs: Added API highlights for Google Play service v6.5 (Nacho) release.
2014-12-05 22:58:30 +00:00
Quddus Chong
9deffeccfe
am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs
...
* commit '15c3ce77fd8eccef01f1c0671485fcc20c4c6e9c':
docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
2014-12-05 22:58:24 +00:00
Wale Ogunwale
b503e3f287
Merge "Don't destroy surfaces of activities launched behind early." into lmp-mr1-dev
2014-12-05 22:56:13 +00:00
Filip Gruszczynski
e6a2ff2b1f
Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev
2014-12-05 22:56:00 +00:00
Dianne Hackborn
0029f0ac36
Merge "Fix issue #17323751 : Additional items in aggregated battery stats" into lmp-mr1-dev
2014-12-05 22:54:08 +00:00
Wale Ogunwale
ec533f6a55
Don't destroy surfaces of activities launched behind early.
...
When the launch activity behind feature was introduced in
http://ag/502868 , we destroy the surfaces of windows associated with
the activity early in the last app window animation step. The causes
issues with activities that might be using the surface and not
prepared to have the surface destroyed from underneath them. We now
let the surface destruction get handled like any other window so all
the components/processes interested in the surface can be in the
right state when the surface is destroyed.
Bug: 18325222
Change-Id: I45e834a07a199b8a9e364f7392db99c871a43280
2014-12-05 14:52:04 -08:00
Quddus Chong
f7b5197749
am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs
...
* commit '87644a43bd3e54e39b330e627148ce6e7245d9b4':
docs: Added API highlights for Google Play service v6.5 (Nacho) release.
2014-12-05 22:47:23 +00:00
Quddus Chong
15c3ce77fd
am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs
...
* commit '0dfcfdcbea3fcfa0679e2ee2a196de17c804479e':
docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
2014-12-05 22:47:17 +00:00
Quddus Chong
87644a43bd
am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs
...
* commit '2b32a042b59fe12393cdb70bc59f0ce8e9a90c91':
docs: Added API highlights for Google Play service v6.5 (Nacho) release.
2014-12-05 22:36:54 +00:00
Quddus Chong
0dfcfdcbea
am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs
...
* commit '230569292c5dfb0e55682c4ecc3b26f0581a8195':
docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
2014-12-05 22:36:49 +00:00
Quddus Chong
2b32a042b5
Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs
2014-12-05 22:30:48 +00:00
Quddus Chong
230569292c
Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs
2014-12-05 22:30:26 +00:00
ztenghui
62517a6e9c
Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev
2014-12-05 21:56:02 +00:00
Dianne Hackborn
1e01d16982
Fix issue #17323751 : Additional items in aggregated battery stats
...
- Now aggregate number of times each process has crashed and ANRed.
- Now aggregate total number of connectivity changes.
- Now record connectivity changes in the history.
Crash and ANR counts are new entries at the end of "pr" in checkin.
Connectivity change counts is a new entry at the end of "m" in checkin.
Connectivity changes in the history checkin are Ecn and include the
type of connection and its state.
Change-Id: I0c01186446034cf6c3fb97d45f5e3b5c69a0438a
2014-12-05 13:54:24 -08:00
Filip Gruszczynski
ff778fe450
Fix calculation of overscan insets in WindowState.
...
Bug: 18630625
Change-Id: I19b0c8627c3b9d61923e68c59fce9bddb2751c3d
2014-12-05 13:31:43 -08:00
Sanket Padawe
0c1a5bea2e
Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev
2014-12-05 20:55:52 +00:00
Eino-Ville Talvala
2ff214b603
Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev
2014-12-05 20:54:08 +00:00
Eino-Ville Talvala
0aaf843c8c
Merge "Fix docs build" into lmp-mr1-dev
2014-12-05 20:53:46 +00:00
Stuart Scott
d2028d90fa
Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev
2014-12-05 20:44:26 +00:00
Jing Zhao
df1d07b4c7
Add checking to find AppDirectedSmsProxy for App Directed SMS feature
...
Adding new system permission android.permission.CARRIER_FILTER_SMS
Bug: 18609762
Change-Id: I80a133653101cd4ec1793e726faf3601e2970224
2014-12-05 20:42:33 +00:00
RoboErik
7c82ced4fc
Route mute key events through MediaSessionService
...
This sends mute keys to the MediaSessionService and handles them
by toggling the appropriate stream. Muting remote playback is still
not supported.
bug:17501993
Change-Id: I18c5b037cde2175acbb64b118dd708514acfd8c9
2014-12-05 12:41:34 -08:00
Stuart Scott
997ddc8e3e
Add mapping between RAT and Network Mode
...
bug:18416275
bug:18415493
Change-Id: I0b29ec953ec9eb29248a22d582013127ee0fea41
2014-12-05 20:28:14 +00:00
Chris Wren
0c5ec0e0db
Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev
2014-12-05 20:22:11 +00:00
Christopher Tate
2aa909f0ab
Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev
2014-12-05 20:05:10 +00:00
Christopher Tate
8ec2dc00e5
Merge "Tune delivery and batching of alarms" into lmp-mr1-dev
2014-12-05 20:04:25 +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
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
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
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
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
0702752cf8
Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev
2014-12-05 18:56:55 +00:00