git.osdn.net Git - android-x86/frameworks-base.git/log

Anthony Hugh [Fri, 30 Oct 2015 20:19:36 +0000 (20:19 +0000)]

Merge "Add intent extra for determining if apps are system apps" into cw-e-dev am: 3a9bf5c8ce
am: a8e20b3919

* commit 'a8e20b391909cbc115e8996bd247e84a2819bfc3':
Add intent extra for determining if apps are system apps

commit | commitdiff | tree

Anthony Hugh [Fri, 30 Oct 2015 20:11:54 +0000 (20:11 +0000)]

Merge "Add intent extra for determining if apps are system apps" into cw-e-dev
am: 3a9bf5c8ce

* commit '3a9bf5c8ceca8783d169faffdc70a6ea88d609bf':
Add intent extra for determining if apps are system apps

commit | commitdiff | tree

Anthony Hugh [Fri, 30 Oct 2015 20:04:10 +0000 (20:04 +0000)]

Merge "Add intent extra for determining if apps are system apps" into cw-e-dev

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:40:03 +0000 (14:40 +0000)]

Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev am: 4ec415800f am: b5ab0ec3c0
am: 22baf9b3c1

* commit '22baf9b3c1f263b1d7fbfea33fe6d9c7c060dc2c':
IMS: Support For Per-Call RAT Info

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:33:34 +0000 (14:33 +0000)]

Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev am: 4ec415800f
am: b5ab0ec3c0

* commit 'b5ab0ec3c05f88c1305d962fffcd185ab5c6a8e9':
IMS: Support For Per-Call RAT Info

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:26:51 +0000 (14:26 +0000)]

Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev
am: 4ec415800f

* commit '4ec415800fd55d2bb128d7635f8b984145dbe983':
IMS: Support For Per-Call RAT Info

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 30 Oct 2015 14:22:28 +0000 (14:22 +0000)]

Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev

commit | commitdiff | tree

Omkar Kolangade [Thu, 29 Oct 2015 22:06:27 +0000 (15:06 -0700)]

IMS: Support For Per-Call RAT Info

Adding the extra key that will be used to
propagate RAT information for each call via
call extras. The key is used in IMS Service.

Bug: 20144385
Change-Id: Ia7ca81d661afb579fd25315036c43489b1dca50d

commit | commitdiff | tree

Carlos Valdivia [Fri, 30 Oct 2015 00:09:21 +0000 (00:09 +0000)]

Get rid of getTypesVisibleToCaller log spam. am: 02bffab9dc am: 1fd46d1581
am: b45f1b8ad1

* commit 'b45f1b8ad10cf30ab8f2ab8ce8fce5f59d3b5e7a':
Get rid of getTypesVisibleToCaller log spam.

commit | commitdiff | tree

Carlos Valdivia [Fri, 30 Oct 2015 00:01:19 +0000 (00:01 +0000)]

Get rid of getTypesVisibleToCaller log spam. am: 02bffab9dc
am: 1fd46d1581

* commit '1fd46d158151dad15d71a5ff857f6f7abc565dcb':
Get rid of getTypesVisibleToCaller log spam.

commit | commitdiff | tree

Carlos Valdivia [Thu, 29 Oct 2015 23:51:51 +0000 (23:51 +0000)]

Get rid of getTypesVisibleToCaller log spam.
am: 02bffab9dc

* commit '02bffab9dc6cc50dd0efdb4bff4feaa9672de5ea':
Get rid of getTypesVisibleToCaller log spam.

commit | commitdiff | tree

Carlos Valdivia [Thu, 29 Oct 2015 23:41:21 +0000 (16:41 -0700)]

Get rid of getTypesVisibleToCaller log spam.

Bug: 25062620
Change-Id: Ia3080c501a288522a5b1de88d50f365357418ba8

commit | commitdiff | tree

Nick Kralevich [Thu, 29 Oct 2015 21:47:27 +0000 (21:47 +0000)]

UsbDeviceManager: set mUsbDataUnlocked=false on user switch am: 5701321701 am: aa330c0dc2
am: d33d66e26c

* commit 'd33d66e26ca53586a91201a69cf67eff61377def':
UsbDeviceManager: set mUsbDataUnlocked=false on user switch

commit | commitdiff | tree

Nick Kralevich [Thu, 29 Oct 2015 21:38:41 +0000 (21:38 +0000)]

UsbDeviceManager: set mUsbDataUnlocked=false on user switch am: 5701321701
am: aa330c0dc2

* commit 'aa330c0dc2331f099ce05ecd76d56b8c9e9c483d':
UsbDeviceManager: set mUsbDataUnlocked=false on user switch

commit | commitdiff | tree

Nick Kralevich [Thu, 29 Oct 2015 21:30:59 +0000 (21:30 +0000)]

UsbDeviceManager: set mUsbDataUnlocked=false on user switch
am: 5701321701

* commit '5701321701a319d3f2d98365a82266eeddaed895':
UsbDeviceManager: set mUsbDataUnlocked=false on user switch

commit | commitdiff | tree

Nick Kralevich [Thu, 29 Oct 2015 19:45:23 +0000 (12:45 -0700)]

UsbDeviceManager: set mUsbDataUnlocked=false on user switch

Make sure access to MTP data is relocked when a user switch occurs.

Bug: 25288494
Change-Id: I69dafc7f51b847f4dba1993a85fb1a51df1a5e37

commit | commitdiff | tree

Geoff Mendal [Thu, 29 Oct 2015 20:00:58 +0000 (20:00 +0000)]

Import translations. DO NOT MERGE am: c3cd7b1585  -s ours am: 57e5d5836c  -s ours
am: 091b11d725  -s ours

* commit '091b11d725897889331287428364154d59406510':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 29 Oct 2015 19:49:05 +0000 (19:49 +0000)]

Import translations. DO NOT MERGE am: c3cd7b1585  -s ours
am: 57e5d5836c  -s ours

* commit '57e5d5836c808de85b460af186d1553709a337d4':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 29 Oct 2015 19:38:38 +0000 (19:38 +0000)]

Import translations. DO NOT MERGE
am: c3cd7b1585 -s ours

* commit 'c3cd7b1585e7ca2b3b1c9ea2ea7a9971c4b0be01':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 29 Oct 2015 19:29:23 +0000 (19:29 +0000)]

Import translations. DO NOT MERGE am: 05738e33ca  -s ours
am: f379a92bd5  -s ours

* commit 'f379a92bd56ee087a71849d530b8f52cfdc3fa1e':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 29 Oct 2015 19:27:09 +0000 (12:27 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 25319151
Change-Id: I4170f31d992d23a365c98fe5e799a31ef48f17bd

commit | commitdiff | tree

Geoff Mendal [Thu, 29 Oct 2015 19:21:22 +0000 (19:21 +0000)]

Import translations. DO NOT MERGE
am: 05738e33ca -s ours

* commit '05738e33ca730100e4825d280c00ab9201178e04':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 29 Oct 2015 19:14:06 +0000 (12:14 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 25319151
Change-Id: Ie6489b1bcab3dc453d04a200028d407dab17c8fa

commit | commitdiff | tree

Lorenzo Colitti [Thu, 29 Oct 2015 08:16:31 +0000 (08:16 +0000)]

Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d am: e4aacaeec9
am: c52503acf0

* commit 'c52503acf0a5e4140376391f57de539fbe60ea8f':
Don't crash if a DHCP server doesn't send the server ID option.

commit | commitdiff | tree

Lorenzo Colitti [Thu, 29 Oct 2015 08:09:27 +0000 (08:09 +0000)]

Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d
am: e4aacaeec9

* commit 'e4aacaeec950691700d717efa894a7b51bc87fe2':
Don't crash if a DHCP server doesn't send the server ID option.

commit | commitdiff | tree

Lorenzo Colitti [Thu, 29 Oct 2015 08:02:31 +0000 (08:02 +0000)]

Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev
am: a2cc04736d

* commit 'a2cc04736d0f9b9621c87ce8d244fd8fd909df7d':
Don't crash if a DHCP server doesn't send the server ID option.

commit | commitdiff | tree

Lorenzo Colitti [Thu, 29 Oct 2015 07:57:13 +0000 (07:57 +0000)]

Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 07:23:06 +0000 (07:23 +0000)]

Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d
am: 3b6f9f78cf

* commit '3b6f9f78cf0ea09176250059653d05cf6a5282c4':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 07:16:07 +0000 (07:16 +0000)]

Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
am: 4636770f0d

* commit '4636770f0df6e91cd7fbdf01b958fbdda688db7a':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 07:10:15 +0000 (07:10 +0000)]

Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev

commit | commitdiff | tree

Lorenzo Colitti [Thu, 29 Oct 2015 06:21:54 +0000 (15:21 +0900)]

Don't crash if a DHCP server doesn't send the server ID option.

This violates a MUST in RFC2131, but apparently some
implementations don't know or care.

Bug: 25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 05:21:54 +0000 (22:21 -0700)]

Add ability to set whether audio route is allowed in BluetoothHeadsetClient

Bug: 25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 05:19:19 +0000 (05:19 +0000)]

Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev am: 0a80294c81
am: 2adf45bee0

* commit '2adf45bee0b423fa6ca758b806a16b968c0a3c65':
Revert "Declare new interface for headset client bluetooth profile to query."

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 05:10:41 +0000 (05:10 +0000)]

Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
am: 0a80294c81

* commit '0a80294c81d86a8bcdc6545b6e31929645cab306':
Revert "Declare new interface for headset client bluetooth profile to query."

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 05:04:06 +0000 (05:04 +0000)]

Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 04:58:38 +0000 (04:58 +0000)]

Revert "Declare new interface for headset client bluetooth profile to query."

This reverts commit 694251eaaa8ea70a9b0427d55e9ede437c83a6d5.

Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 04:53:01 +0000 (04:53 +0000)]

Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev am: a841973dee
am: 8b4f21b108

* commit '8b4f21b108828c08833767c1f3f908e1cd7f8477':
Declare new interface for headset client bluetooth profile to query.

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 04:45:09 +0000 (04:45 +0000)]

Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
am: a841973dee

* commit 'a841973deea9281bbb21035055918c0b0cb3230f':
Declare new interface for headset client bluetooth profile to query.

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 04:39:08 +0000 (04:39 +0000)]

Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev

commit | commitdiff | tree

Bryce Lee [Thu, 29 Oct 2015 04:06:27 +0000 (21:06 -0700)]

Declare new interface for headset client bluetooth profile to query.

This is needed in order to allow implementations of the HFP HF side to
define when audio can be routed to the device. This allows for calls dialed
from an AG to be kept on the AG if desired.

Bug: 25332357
Change-Id: I35a554cfc53f88c7dd3059bf52df5c69df9c7415

commit | commitdiff | tree

Svetoslav Ganov [Thu, 29 Oct 2015 01:33:09 +0000 (01:33 +0000)]

Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a am: 35151fbc8b
am: 08d013d3a1

* commit '08d013d3a1e6306533c2fae1a4581986ffc9a642':
Make SYSTEM_ALERT_WINDOW development permission

commit | commitdiff | tree

Svetoslav Ganov [Thu, 29 Oct 2015 01:24:38 +0000 (01:24 +0000)]

Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a
am: 35151fbc8b

* commit '35151fbc8b028f6633f477fd36044032a03b2bff':
Make SYSTEM_ALERT_WINDOW development permission

commit | commitdiff | tree

Svetoslav Ganov [Thu, 29 Oct 2015 01:16:46 +0000 (01:16 +0000)]

Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
am: 2658cb002a

* commit '2658cb002abae9341c9a82bfeaed764ba5bf97c8':
Make SYSTEM_ALERT_WINDOW development permission

commit | commitdiff | tree

Svetoslav Ganov [Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)]

Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev

commit | commitdiff | tree

Anthony Hugh [Wed, 28 Oct 2015 18:38:32 +0000 (18:38 +0000)]

Merge "Update permission label strings" into cw-e-dev am: b69cab65d1
am: 41579ff8fc

* commit '41579ff8fc06ad655e158b1ab825624437489c83':
Update permission label strings

commit | commitdiff | tree

Anthony Hugh [Wed, 28 Oct 2015 18:29:06 +0000 (18:29 +0000)]

Merge "Update permission label strings" into cw-e-dev
am: b69cab65d1

* commit 'b69cab65d180c3166ac84e47da0aa0c1c27bbc67':
Update permission label strings

commit | commitdiff | tree

Anthony Hugh [Wed, 28 Oct 2015 18:22:41 +0000 (18:22 +0000)]

Merge "Update permission label strings" into cw-e-dev

commit | commitdiff | tree

Ching Tzung Lin [Wed, 28 Oct 2015 17:41:24 +0000 (17:41 +0000)]

Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e
am: c45009906a

* commit 'c45009906ade7b25b6c01c02113c044bd9290ffb':
Consolidates config_windowOutsetBottom and circular_display_mask_offset

commit | commitdiff | tree

Ching Tzung Lin [Wed, 28 Oct 2015 17:33:03 +0000 (17:33 +0000)]

Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
am: 36da2a208e

* commit '36da2a208e253d0635bb569cb92ea0e11f489b4e':
Consolidates config_windowOutsetBottom and circular_display_mask_offset

commit | commitdiff | tree

Ching Tzung Lin [Wed, 28 Oct 2015 17:25:24 +0000 (17:25 +0000)]

Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 15:00:44 +0000 (15:00 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c  -s ours am: d2b3815dda  -s ours
am: 9aa91f99b2  -s ours

* commit '9aa91f99b26ddac01c7045e1a18b6f0116b4eec7':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:52:31 +0000 (14:52 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c  -s ours
am: d2b3815dda  -s ours

* commit 'd2b3815dda57702ebbd00a6422d21a52b0604dfa':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:43:38 +0000 (14:43 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: c7522c0b1c -s ours

* commit 'c7522c0b1c3b8f445ddc1b75f0600363ecbd27a6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:39:12 +0000 (14:39 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a4f0ea406d  -s ours
am: 4c55431f51  -s ours

* commit '4c55431f51a3c3c67b3234e4902e7fda5cb81c76':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:38:11 +0000 (14:38 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:37:31 +0000 (07:37 -0700)]

Import translations. DO NOT MERGE

Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:29:50 +0000 (14:29 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: a4f0ea406d -s ours

* commit 'a4f0ea406d9c4de166ec65541581666e782b3846':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:26:00 +0000 (14:26 +0000)]

Import translations. DO NOT MERGE am: b8afc77c0a  -s ours am: 7934d4e206  -s ours
am: 32076214a4  -s ours

* commit '32076214a40a98553a7c634d8d8a8d1eb2efb625':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:22:47 +0000 (14:22 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:21:49 +0000 (07:21 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9c1726898d50ea8971a12ddc9fe575615682f95d
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:18:25 +0000 (14:18 +0000)]

Import translations. DO NOT MERGE am: b8afc77c0a  -s ours
am: 7934d4e206  -s ours

* commit '7934d4e20603eb2aaa6f6041c932e9ef70b5612f':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 14:11:00 +0000 (14:11 +0000)]

Import translations. DO NOT MERGE
am: b8afc77c0a -s ours

* commit 'b8afc77c0a20a5d4ff7d1afb060c474feeefb1fe':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 13:59:45 +0000 (06:59 -0700)]

Import translations. DO NOT MERGE

Change-Id: If7c4ccf382e85f88a4fac586ca870068d8219974
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 12:30:10 +0000 (12:30 +0000)]

Import translations. DO NOT MERGE am: 44036023a5  -s ours
am: 5d79e1b9c1  -s ours

* commit '5d79e1b9c1129a60663fca69892ebc14270e5d87':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 12:21:45 +0000 (12:21 +0000)]

Import translations. DO NOT MERGE
am: 44036023a5 -s ours

* commit '44036023a574fa8526c6b436ff5309d5939c94cd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 28 Oct 2015 12:13:26 +0000 (05:13 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0fba6c467156c09874291320bf9f18d13e4ba466
Auto-generated-cl: translation import

commit | commitdiff | tree

Daniel Sandler [Wed, 28 Oct 2015 03:30:40 +0000 (03:30 +0000)]

Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21 am: 21858e56d6 -s ours
am: 638003c4fd

* commit '638003c4fdf959686ba35d19cb99805d3c5f578c':
Petites fautes.

commit | commitdiff | tree

Daniel Sandler [Wed, 28 Oct 2015 03:21:35 +0000 (03:21 +0000)]

Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21
am: 21858e56d6 -s ours

* commit '21858e56d640109e36b2f02e244e125adf37020c':
Petites fautes.

commit | commitdiff | tree

Svetoslav [Tue, 27 Oct 2015 22:22:39 +0000 (15:22 -0700)]

Make SYSTEM_ALERT_WINDOW development permission

bug:25329324

Change-Id: I0086464846bab9424764dd0d726692d96a0f1207

commit | commitdiff | tree

Anthony Hugh [Tue, 27 Oct 2015 21:13:42 +0000 (14:13 -0700)]

Update permission label strings

Updates permission labels to have more consistent
grammar and capitalization.

BUG: 23760467
Change-Id: I61c2f9c72fdf4318e1773f3e0385fb86e0d65f69

commit | commitdiff | tree

Dianne Hackborn [Tue, 27 Oct 2015 20:04:49 +0000 (20:04 +0000)]

Fix issue #25289999: Lower device idle alarm limit to 10 mins. am: 7682b26ea1 am: 26654c92ca
am: 40bced1d6e

* commit '40bced1d6ed2dadbd1fff116dad382582c430297':
Fix issue #25289999: Lower device idle alarm limit to 10 mins.

commit | commitdiff | tree

Daniel Sandler [Tue, 27 Oct 2015 20:00:01 +0000 (20:00 +0000)]

Merge "Petites fautes." into mnc-dr-dev
am: da43cc0a21

* commit 'da43cc0a2150a1c74340b75c919425e2a3f5b6fe':
Petites fautes.

commit | commitdiff | tree

Dianne Hackborn [Tue, 27 Oct 2015 19:55:02 +0000 (19:55 +0000)]

Fix issue #25289999: Lower device idle alarm limit to 10 mins. am: 7682b26ea1
am: 26654c92ca

* commit '26654c92caf3d5443e2d7a50fc3573e8d81446d8':
Fix issue #25289999: Lower device idle alarm limit to 10 mins.

commit | commitdiff | tree

Daniel Sandler [Tue, 27 Oct 2015 19:51:31 +0000 (19:51 +0000)]

Merge "Petites fautes." into mnc-dr-dev

commit | commitdiff | tree

Dianne Hackborn [Tue, 27 Oct 2015 19:46:12 +0000 (19:46 +0000)]

Fix issue #25289999: Lower device idle alarm limit to 10 mins.
am: 7682b26ea1

* commit '7682b26ea164ba1078495e24910f22d73766c192':
Fix issue #25289999: Lower device idle alarm limit to 10 mins.

commit | commitdiff | tree

Dan Sandler [Tue, 27 Oct 2015 17:42:55 +0000 (13:42 -0400)]

Petites fautes.

Bug: 25308153
Change-Id: I62ffe080e3f36eb685cdc06d8c106d32e18092ed

commit | commitdiff | tree

Dianne Hackborn [Tue, 27 Oct 2015 00:51:57 +0000 (17:51 -0700)]

Fix issue #25289999: Lower device idle alarm limit to 10 mins.

This helps with some cases where perisistent network connections
need a more frequent keep alive signal. Actually make it 9
minutes to ensure that things needing a 10 minute cycle will
execute within that time.

Change-Id: Ife8c7b7f7f82b108d5a6c1624bd6115e6087c3be

commit | commitdiff | tree

Wale Ogunwale [Tue, 27 Oct 2015 15:27:16 +0000 (15:27 +0000)]

Merge "[ActivityManager] Fix IndexOutOfBoundsException" am: a61515720a
am: 6c8b91d8c2

* commit '6c8b91d8c2c657eb8a5b0afa00a3b93044447f56':
[ActivityManager] Fix IndexOutOfBoundsException

commit | commitdiff | tree

Wale Ogunwale [Tue, 27 Oct 2015 15:19:56 +0000 (15:19 +0000)]

Merge "[ActivityManager] Fix IndexOutOfBoundsException"
am: a61515720a

* commit 'a61515720ab95f6aa307c1fa4337c5c2078bad26':
[ActivityManager] Fix IndexOutOfBoundsException

commit | commitdiff | tree

Wale Ogunwale [Tue, 27 Oct 2015 15:12:56 +0000 (15:12 +0000)]

Merge "[ActivityManager] Fix IndexOutOfBoundsException"

commit | commitdiff | tree

louis_chang [Tue, 27 Oct 2015 02:45:53 +0000 (10:45 +0800)]

[ActivityManager] Fix IndexOutOfBoundsException

Symptom:
The stack was deleted during cleanup, so the stack
list size has reduced by one and cause this issue.

IndexOutOfBoundsException: Invalid index 1, size is 1

Change-Id: Ic6722aed98a0ad789b331d00e89cb74bf3b36d4c

commit | commitdiff | tree

Anthony Hugh [Tue, 27 Oct 2015 00:47:05 +0000 (17:47 -0700)]

Add intent extra for determining if apps are system apps

This is being added to help identify system apps so that
the UI can filter on that type.

BUG: 24955055
Change-Id: Ie4be3717ce997f60eeb48a389c0f54ce5803141a

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:52:50 +0000 (19:52 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 337495bded  -s ours
am: 515e97a52c  -s ours

* commit '515e97a52c0b15d3e7a2d629d3faa821fa4f285e':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:51:18 +0000 (19:51 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: db4f28692a  -s ours
am: ad3bd48dfe  -s ours

* commit 'ad3bd48dfe219ac6cb8531f7a7750437c75b0fa3':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:49:00 +0000 (19:49 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 9865051825  -s ours
am: fe4a48c010  -s ours

* commit 'fe4a48c01056f539f041572c5b685fa44eddb9f4':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:44:27 +0000 (19:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 337495bded -s ours

* commit '337495bded9c4035a922274143c1ab119e692bdd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:42:59 +0000 (19:42 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: db4f28692a -s ours

* commit 'db4f28692aacccb57d64f86b3dfd4205bafebf9b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:40:56 +0000 (19:40 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 9865051825 -s ours

* commit '9865051825fbc709510deefa129c4210fadf057a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:36:01 +0000 (19:36 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:35:20 +0000 (19:35 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:35:02 +0000 (19:35 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:16:11 +0000 (19:16 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 8961b24ff2  -s ours
am: 7976a3fbf4  -s ours

* commit '7976a3fbf4581b7b9ef531e8dcd7e6e889d08d76':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:14:46 +0000 (19:14 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 4917e9dd1c  -s ours
am: e8be87e96f  -s ours

* commit 'e8be87e96f7c9e854e7ac57475f38fedb8e1cac8':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:13:04 +0000 (19:13 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 82b5276866  -s ours
am: 76941becab  -s ours

* commit '76941becab388c347577dfc60d6fae4b190b684a':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:08:26 +0000 (19:08 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 8961b24ff2 -s ours

* commit '8961b24ff2541fc246e275ae3cc4cdda64934462':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:06:53 +0000 (19:06 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 4917e9dd1c -s ours

* commit '4917e9dd1c727a003e9636e4c78c3f5c1aad7402':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:06:21 +0000 (12:06 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic500efe78e3dd02f8dd74b8c687443bbe559355b
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:04:39 +0000 (19:04 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 82b5276866 -s ours

* commit '82b52768667a16a6ef02b2d9aa9cd171f547331a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:04:18 +0000 (12:04 -0700)]

Import translations. DO NOT MERGE

Change-Id: I07f75df116b723529d96cacf5ac8431caafb022d
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 26 Oct 2015 19:02:09 +0000 (12:02 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9ecfe0ecad2b5aa88fc4b60d6d5f8e718ec19bcf
Auto-generated-cl: translation import