vandwalle
93e4192c06
add disable Ephemeral Network API
...
Bug:18525241
Change-Id: I954c53c55c39f6c376b2bae3c7ac4d28246a7f5a
2014-12-05 14:56:43 -08: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
550348220e
am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev
...
* commit '62517a6e9ce85b23da67767a9e75e252d7989502':
Fine tune the light radius from 800dp to 600dp
2014-12-05 22:12:50 +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
Svet Ganov
b3fa2787ea
When accessibility on cannot click on a view covered by a HorizontalScrollView
...
In accessibility mode we send down and up events activate a view. We will later
switch to accessibility actions but for now as a bridge-gap we compute a point on
the screen where to click for activating the view. The heuristic we use has edge
cases such as a view that handles all touch events but does not have any listeners.
In this case we do not ignore the target view's area covered by a view that handles
all touch events. As a result we click on the wrong target. While we cannot solve
this generically, in the case of standard components such as HorizontalScrollView
we can.
bug:18612258
Change-Id: If8482aac0d0ea53c5c90367d099d1b8d3a4559ed
2014-12-05 13:13:15 -08:00
Sanket Padawe
49aeee2e79
am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev
...
* commit '0c1a5bea2eb897b3f1d34b9c25ea6ed0bd5ca6eb':
Doing provisioning check for wifi tethering from SystemUI
2014-12-05 20:59:02 +00:00
Eino-Ville Talvala
4b905ad436
am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev
...
* commit '2ff214b603939af60cae11727e189eb350b34c39':
Camera2: Add HDR scene mode for backwards compatibility.
2014-12-05 20:58:56 +00:00
Eino-Ville Talvala
3e3ae5b715
am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev
...
* commit '0aaf843c8cdcbcce9f491bf8734a4b75fec2ad6b':
Fix docs build
2014-12-05 20:58:51 +00: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
eb29c7332c
am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev
...
* commit 'd2028d90fa99196dd1fc70825f94cd0a5da83854':
Add mapping between RAT and Network Mode
2014-12-05 20:47:56 +00:00
Jing Zhao
23ad6efbf8
am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature
...
* commit 'df1d07b4c77bcc8928b2e5360440aa9b69a6cd21':
Add checking to find AppDirectedSmsProxy for App Directed SMS feature
2014-12-05 20:47:42 +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
Chris Wren
ea9abd14dc
am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev
...
* commit '0c5ec0e0db3ac8d3d1ed6796ab2bcc9cc37cf5fa':
Avoid race condition in heads up snooze code path.
2014-12-05 20:29:10 +00: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
41b0cbb3a6
am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev
...
* commit '2aa909f0ab017e17d8397f18b8c2c6dc0ec150a4':
Correctly parse previous PMBA state during backup
2014-12-05 20:11:31 +00:00
Christopher Tate
a42d95f1bc
am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev
...
* commit '8ec2dc00e5225256976ee6f07a715932f65c8833':
Tune delivery and batching of alarms
2014-12-05 20:11:26 +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
d89f0d3d54
am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
...
* commit 'b81ce34af33ce940846e71878279f9482037cb39':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
2014-12-05 19:44:53 +00:00
Justin Harrison
87797c056c
am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev
...
* commit '4a9cecb1f0bb6f5f949f33c5f07be6d995f4cf24':
Add UUID for Pbap client
2014-12-05 19:44:48 +00:00
Ihab Awad
9ae44f927d
am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev
...
* commit '710e20d22516a896c3560d96fdec423ffa0d154e':
Relax access on deprecated fields for compatibility.
2014-12-05 19:44:43 +00:00
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
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
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
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
Wink Saville
36ffb0494d
Add subId as parameter for get/setDataEnabled.
...
Bug: 18279333
Change-Id: I2496a2fd92b154e5e6981cbf6b5b5939cda59122
2014-12-05 11:10:30 -08:00