OSDN Git Service
Jason Monk [Thu, 5 May 2016 15:53:25 +0000 (15:53 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev am:
d1a4e452ed
am:
9c38c20900
* commit '
9c38c209001d0151bc4e58a2b5c8f95bfb2d1cc4':
Don't crash on non-app data usage
Change-Id: If07b3e928a6daabfdfb82144211f4e2996ec2b87
Jason Monk [Thu, 5 May 2016 15:53:24 +0000 (15:53 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev am:
2a6bc40d49
am:
6f71ed9dbb
* commit '
6f71ed9dbb92fae8bcd4aa32000f656f7efd8467':
Fix cell data limit dialog title
Change-Id: I480483e8a259c0c8ebfea79f82dbd09a30e44093
Jason Monk [Thu, 5 May 2016 15:47:54 +0000 (15:47 +0000)]
Merge "Don\'t crash on non-app data usage" into nyc-dev
am:
d1a4e452ed
* commit '
d1a4e452ed659f4f52b0b72f54da1100c6b1f512':
Don't crash on non-app data usage
Change-Id: I46b35f11555442c2b7e1301d1dec8ee95807f36c
Jason Monk [Thu, 5 May 2016 15:47:54 +0000 (15:47 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev
am:
2a6bc40d49
* commit '
2a6bc40d497d1bc0fdfc9cc86bc4db72791909b7':
Fix cell data limit dialog title
Change-Id: Ia087f0ace8cb1f9a3c93ced1b3500207b6d63cf4
Jason Monk [Thu, 5 May 2016 15:41:17 +0000 (15:41 +0000)]
Merge "Don't crash on non-app data usage" into nyc-dev
Jason Monk [Thu, 5 May 2016 15:40:50 +0000 (15:40 +0000)]
Merge "Fix cell data limit dialog title" into nyc-dev
Android Build Merger (Role) [Thu, 5 May 2016 13:59:47 +0000 (13:59 +0000)]
Merge "Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am:
de4b51c8ce am:
ce2201a04c" into nyc-mr1-dev-plus-aosp
Tony Mak [Thu, 5 May 2016 13:59:34 +0000 (13:59 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am:
de4b51c8ce
am:
a428e704e0
* commit '
a428e704e02499321b7b3b4393659394973a85e7':
Should forward the intent even if its activity is disabled in Settings
Change-Id: Ia82393fcebaa31b788d3af98291a4a7628f59787
Tony Mak [Thu, 5 May 2016 13:59:34 +0000 (13:59 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am:
de4b51c8ce
am:
ce2201a04c
* commit '
ce2201a04c824fa8cc0376e786f511a2067b0a77':
Should forward the intent even if its activity is disabled in Settings
Change-Id: I3fc793f36f1440fa5c2a1adbd098fc451462b178
Tony Mak [Thu, 5 May 2016 13:57:03 +0000 (13:57 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
am:
de4b51c8ce
* commit '
de4b51c8ce4d16ef086ad04532113a942b267f1a':
Should forward the intent even if its activity is disabled in Settings
Change-Id: Ifeee1ee85084aa668ca3f7083db80cdf4da3beb9
Tony Mak [Thu, 5 May 2016 13:57:03 +0000 (13:57 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
am:
de4b51c8ce
* commit '
de4b51c8ce4d16ef086ad04532113a942b267f1a':
Should forward the intent even if its activity is disabled in Settings
Change-Id: I3f2c1ce85fc96f299b931a99036f72e1e2478bd8
Tony Mak [Thu, 5 May 2016 13:50:09 +0000 (13:50 +0000)]
Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev
Philip P. Moltmann [Wed, 4 May 2016 21:51:31 +0000 (21:51 +0000)]
Merge "Do not set order for print services settings." into nyc-dev am:
de4e43edda
am:
c43f32d331
* commit '
c43f32d33113d583af3afdd69661a1ff8e56d378':
Change-Id: I82ae791c4c275ebb704961efb204046431179de0
Robin Lee [Wed, 4 May 2016 21:51:30 +0000 (21:51 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am:
662731fb55
am:
eb36dbea1f
* commit '
eb36dbea1ff194940c86efd61b2aa1131b96e0f3':
Change-Id: I26a94de28ba124025d9500459c6e134e137681e9
Hyunyoung Song [Wed, 4 May 2016 21:49:47 +0000 (21:49 +0000)]
Merge "Add shortcut manager support to Settings (2/2) b/
28298258" into nyc-mr1-dev
am:
5a3e547143
* commit '
5a3e5471430d00892beb05ec55dc466c2039a36a':
Add shortcut manager support to Settings (2/2) b/
28298258
Change-Id: I88f02a0d70880f171d742b3fe0652f21baf25a70
Philip P. Moltmann [Wed, 4 May 2016 21:49:46 +0000 (21:49 +0000)]
Merge "Do not set order for print services settings." into nyc-dev am:
de4e43edda
am:
5cc5f2d70e
* commit '
5cc5f2d70eaa51ad2c7577e923e2350ed5642d4a':
Do not set order for print services settings.
Change-Id: I5a457d0b2f81121f74b70a5981510becf99b49ca
Robin Lee [Wed, 4 May 2016 21:49:45 +0000 (21:49 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am:
662731fb55
am:
ed5f33740c
* commit '
ed5f33740cf0305cd723f4a5415423bf5fa969c4':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I3d924e1e8dd69c2392cd09d8c048de7d96b01f40
Hyunyoung Song [Wed, 4 May 2016 20:43:08 +0000 (20:43 +0000)]
Merge "Add shortcut manager support to Settings (2/2) b/
28298258" into nyc-mr1-dev
Jason Monk [Wed, 4 May 2016 19:46:05 +0000 (15:46 -0400)]
Fix cell data limit dialog title
Change-Id: I0303bc74bb7b0e46ed020d255baf2465c7db0fc5
Fixes:
27604216
Philip P. Moltmann [Wed, 4 May 2016 19:19:06 +0000 (19:19 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
am:
de4e43edda
* commit '
de4e43eddae70b63671083fd6fc95de7df1ed2fd':
Do not set order for print services settings.
Change-Id: Ibca759a4db12c5edb913711344a860cff75022ee
Philip P. Moltmann [Wed, 4 May 2016 19:19:06 +0000 (19:19 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
am:
de4e43edda
* commit '
de4e43eddae70b63671083fd6fc95de7df1ed2fd':
Do not set order for print services settings.
Change-Id: Icb3b9ca85af76635eb64a60a45cd91fc13ab7bb1
Philip P. Moltmann [Wed, 4 May 2016 19:08:48 +0000 (19:08 +0000)]
Merge "Do not set order for print services settings." into nyc-dev
Robin Lee [Wed, 4 May 2016 18:58:17 +0000 (18:58 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am:
662731fb55
* commit '
662731fb55971cb81d52dd611075c7a5df5eb023':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I843e1e6da26237465dd054267a1031d7e38bdbc0
Robin Lee [Wed, 4 May 2016 18:54:52 +0000 (18:54 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am:
662731fb55
* commit '
662731fb55971cb81d52dd611075c7a5df5eb023':
Add lockdownEnabled parameter to always-on VPN API
Change-Id: I0730abfe3c7cbec60f3961f5c9d8e111c2e8a5ac
Hyunyoung Song [Wed, 4 May 2016 17:49:59 +0000 (10:49 -0700)]
Add shortcut manager support to Settings (2/2)
b/
28298258
Locale change will be handled in future CL/ dynamic shortcut list
change using a UI will be handled in follow up CL.
Change-Id: I5468b17e8c8b32625139ab0484d5d0386be0961d
Robin Lee [Wed, 4 May 2016 18:38:28 +0000 (18:38 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
Fan Zhang [Wed, 4 May 2016 18:03:42 +0000 (18:03 +0000)]
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
am:
00b127b134
* commit '
00b127b134ff41ea14ec56fdd33c076e1ccffc1c':
Bring escalation options UI closer to mock.
Change-Id: I4e97594c7ea9d5c70f0629fae2c0f894a3fbab08
Jeff Sharkey [Wed, 4 May 2016 18:03:29 +0000 (18:03 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev am:
e50853f485
am:
6c2fccfabf
* commit '
6c2fccfabfd3faf30d9e646a133e058096f39a7b':
Change-Id: I560d0fd886b79ae1f6556ce20a19e8807d03cc52
Jeff Sharkey [Wed, 4 May 2016 18:00:35 +0000 (18:00 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev am:
e50853f485
am:
0d613ab2cf
* commit '
0d613ab2cf31d9a6608e5cf4b7e0f5e82ae89969':
UX polish tweaks to FallbackHome.
Change-Id: Ib6ef02d4a2f073b12b4079af82569489585fab93
Fan Zhang [Wed, 4 May 2016 17:47:17 +0000 (17:47 +0000)]
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
Jason Monk [Wed, 4 May 2016 17:43:26 +0000 (13:43 -0400)]
Don't crash on non-app data usage
Change-Id: Ib39fc280a892dea2e3e7cbe22339799ab51a6eca
Fixes:
28531037
Jeff Sharkey [Wed, 4 May 2016 17:34:56 +0000 (17:34 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
am:
e50853f485
* commit '
e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I392867952c277fea71ab86389ed6df1e5e483b20
Jeff Sharkey [Wed, 4 May 2016 17:34:55 +0000 (17:34 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
am:
e50853f485
* commit '
e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I9fc3f4df1333e6e17bb7aa809f2a8a822697b616
TreeHugger Robot [Wed, 4 May 2016 17:13:16 +0000 (17:13 +0000)]
Merge "UX polish tweaks to FallbackHome." into nyc-dev
Philip P. Moltmann [Wed, 4 May 2016 16:44:01 +0000 (09:44 -0700)]
Do not set order for print services settings.
What happened before was that negative number turned out to be order
behind ORDER_LAST.
Change-Id: I714f623a2b1be06dde86ae7f36b39c64006203f2
Daniel Nishi [Wed, 4 May 2016 16:31:26 +0000 (16:31 +0000)]
Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev
am:
38cdbf7fdc
* commit '
38cdbf7fdced67563f26c334dfa6c5dcf78eaecc':
Fix a bug where negative file sizes were being used.
Change-Id: I177311d921c89f30545080b2fec73f95f81a30ef
Daniel Nishi [Wed, 4 May 2016 16:13:24 +0000 (16:13 +0000)]
Merge "Fix a bug where negative file sizes were being used." into nyc-mr1-dev
Fan Zhang [Thu, 28 Apr 2016 22:20:09 +0000 (15:20 -0700)]
Bring escalation options UI closer to mock.
Bug:
28141203
Change-Id: Ia6d50d7d6f3010695c62fc1e8bd07f858715e455
Android Build Merger (Role) [Wed, 4 May 2016 14:32:11 +0000 (14:32 +0000)]
Merge "Merge "More informative title while choosing work lock." into nyc-dev am:
9efcb2e314 am:
49a3cc0fb6" into nyc-mr1-dev-plus-aosp
Mahaver Chopra [Wed, 4 May 2016 14:31:56 +0000 (14:31 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev am:
9efcb2e314
am:
49a3cc0fb6
* commit '
49a3cc0fb683f28e907fdf7c72a21bffb6af43a8':
More informative title while choosing work lock.
Change-Id: Ic463aa2e0c3640f5d22217837aa106be28e51523
Mahaver Chopra [Wed, 4 May 2016 14:31:53 +0000 (14:31 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev am:
9efcb2e314
am:
b735c1baf7
* commit '
b735c1baf7affe1bc26ce6be3abe605026f828e2':
More informative title while choosing work lock.
Change-Id: I56a16ff55bf5c84ccecafb1f6e8d958fbe0890b0
Mahaver Chopra [Wed, 4 May 2016 14:22:27 +0000 (14:22 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
am:
9efcb2e314
* commit '
9efcb2e314f4c31de26cea629b03b436f7b84df1':
More informative title while choosing work lock.
Change-Id: I38dce28a33ac847cba1f256d99ec2a0f092d5b4c
Mahaver Chopra [Wed, 4 May 2016 14:22:27 +0000 (14:22 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
am:
9efcb2e314
* commit '
9efcb2e314f4c31de26cea629b03b436f7b84df1':
More informative title while choosing work lock.
Change-Id: Ib71598d4112cb10392fa32cc39aa10699ad6855e
Mahaver Chopra [Wed, 4 May 2016 14:03:08 +0000 (14:03 +0000)]
Merge "More informative title while choosing work lock." into nyc-dev
Nicolas Prévot [Wed, 4 May 2016 13:05:24 +0000 (13:05 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev am:
832c8e4fda
am:
0eab365289
* commit '
0eab3652891460e3c4ce3582a14f682e5759fb55':
Change-Id: I84b70273827460caf65d04759eb06cf624579f1c
Nicolas Prévot [Wed, 4 May 2016 13:00:47 +0000 (13:00 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev am:
832c8e4fda
am:
d16c520451
* commit '
d16c52045150854da9efad21623b24d6c443b373':
Only ask for credentials in add account if user is locked.
Change-Id: Iaae924082368b59cec76b5720a604f4eb59f7deb
Nicolas Prevot [Wed, 4 May 2016 12:53:44 +0000 (12:53 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
am:
832c8e4fda
* commit '
832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0':
Only ask for credentials in add account if user is locked.
Change-Id: Ieacd13cc6536fd789b76246de550c4592cfe4b57
Nicolas Prevot [Wed, 4 May 2016 12:53:36 +0000 (12:53 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
am:
832c8e4fda
* commit '
832c8e4fdadce8b8fd9b13fe584a7dfb0324d0a0':
Only ask for credentials in add account if user is locked.
Change-Id: Ic93962179b1ce9ac19233810dbf065aedd662168
Tony Mak [Wed, 4 May 2016 12:51:41 +0000 (13:51 +0100)]
Should forward the intent even if its activity is disabled in Settings
This fixes the cross profile intent filter test in CtsVerifier.
Activities of action APPLICATION_DEVELOPMENT_SETTINGS and
NFC_PAYMENT_SETTINGS are disabled in managed profile. But we still
want their corresponding intents to be forwarded to personal side.
Bug:
28426865
Change-Id: I65afc06f7faf4532d9e132f44c1faa49f47d1a2e
Nicolas Prévot [Wed, 4 May 2016 12:43:31 +0000 (12:43 +0000)]
Merge "Only ask for credentials in add account if user is locked." into nyc-dev
Mahaver Chopra [Wed, 4 May 2016 12:11:17 +0000 (13:11 +0100)]
More informative title while choosing work lock.
When Intent ACTION_SET_NEW_PASSWORD is called from a managed profile,
ChooseLockGeneric fragment shows title "Unlock Selection", update that to
"Choose work lock".
Bug:
28451356
Change-Id: I9bcf4698557fa453337aa666f10f94f15e7624fa
Tony Mak [Wed, 4 May 2016 10:46:21 +0000 (10:46 +0000)]
Merge "Add managed profile setting page" into nyc-dev am:
d5b3a5d342
am:
b8cfa32bf1
* commit '
b8cfa32bf1a91757002ce8e7dd7c134d9a57d6de':
Change-Id: I54f81ebdc56bc6f937a11e62cee1a70f3dd622f0
Tony Mak [Wed, 4 May 2016 10:40:57 +0000 (10:40 +0000)]
resolve merge conflicts of
d5b3a5d to nyc-mr1-dev
am:
8f14564787
* commit '
8f14564787da3705a895e945c72c890604d13cfd':
Add managed profile setting page
Change-Id: If1f79ebf4127aac5d8eb7b5ce74c32e3ad145121
Nicolas Prevot [Thu, 21 Apr 2016 11:26:48 +0000 (12:26 +0100)]
Only ask for credentials in add account if user is locked.
Also: if work mode is off, ask to turn work on before adding
a work account.
BUG:
28220470
Change-Id: Ib23f87f056ad41c1f9713bb8d3c5263f015e6475
Tony Mak [Wed, 4 May 2016 10:14:48 +0000 (11:14 +0100)]
resolve merge conflicts of
d5b3a5d to nyc-mr1-dev
Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb
Tony Mak [Wed, 4 May 2016 09:41:58 +0000 (09:41 +0000)]
Merge "Add managed profile setting page" into nyc-dev
am:
d5b3a5d342
* commit '
d5b3a5d342d74411b0e4466541d5c5b1168eb803':
Add managed profile setting page
Change-Id: I1ca66552fe44e7ace9ff7b314ab0f7af53ca1e6c
Tony Mak [Wed, 4 May 2016 09:33:24 +0000 (09:33 +0000)]
Merge "Add managed profile setting page" into nyc-dev
Baligh Uddin [Wed, 4 May 2016 00:39:47 +0000 (00:39 +0000)]
Import translations. DO NOT MERGE am:
61e99fed5b -s ours
am:
cce4c8e845 -s ours
* commit '
cce4c8e845f4d5096c82da25e872c35854b3b0f3':
Change-Id: I1b1d2cc5bcebe17fc155b07670585e1bbc708cc6
Baligh Uddin [Wed, 4 May 2016 00:29:06 +0000 (00:29 +0000)]
Import translations. DO NOT MERGE am:
61e99fed5b -s ours
am:
bf78b8c221 -s ours
* commit '
bf78b8c221beefc4e75553fc3cc15110d4affc8b':
Import translations. DO NOT MERGE
Change-Id: Ic4bc471614c30426dc016f49e004bfa4ff988606
Baligh Uddin [Wed, 4 May 2016 00:23:48 +0000 (00:23 +0000)]
Import translations. DO NOT MERGE
am:
61e99fed5b -s ours
* commit '
61e99fed5bf1791f0cc73199f8d99d9519a9f811':
Import translations. DO NOT MERGE
Change-Id: I6f32a88ec655e494347168c37cb0ecba7ebea8ba
Baligh Uddin [Wed, 4 May 2016 00:23:42 +0000 (00:23 +0000)]
Import translations. DO NOT MERGE
am:
61e99fed5b -s ours
* commit '
61e99fed5bf1791f0cc73199f8d99d9519a9f811':
Import translations. DO NOT MERGE
Change-Id: Ic97822a7035c3c0ec954714c304ea1b4461ad094
Daniel Nishi [Wed, 4 May 2016 00:21:51 +0000 (17:21 -0700)]
Fix a bug where negative file sizes were being used.
Negative file sizes for packages occurs when the file size is either
unknown or if an error occurred during size calculation. As a result,
we can skip them for total freeable space calculations.
Bug:
28465884
Change-Id: I340d725a66a228fd94993781c5e8ef732a60a7b3
Baligh Uddin [Wed, 4 May 2016 00:00:33 +0000 (17:00 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28463229
Change-Id: I7f6bb467fe967635f9febafb61764b596d075fa3
Jeff Sharkey [Tue, 3 May 2016 23:25:37 +0000 (17:25 -0600)]
UX polish tweaks to FallbackHome.
When showing during first boot (before provisioned), render as
completely black to avoid wallpaper jank before showing SUW. Also
tweak theme used during normal (provisioned) launches to avoid
rendering the dim layer behind status bar.
Bug:
28530777
Change-Id: I4b9e6c54583f07c78d86fbe9bda7f24b6959f4ba
Andrew Sapperstein [Tue, 3 May 2016 19:45:50 +0000 (19:45 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-mr1-dev
am:
bc25322de8
* commit '
bc25322de81dd149e407f8eb9f9ecd90bc1394bc':
Null check intent before starting "learn more".
Change-Id: I0ca8a07f16a3aa68a87796eb2c840fdbf468a363
Jason Monk [Tue, 3 May 2016 19:45:07 +0000 (19:45 +0000)]
Merge "Fix leaks" into nyc-dev am:
ea8ee68507
am:
065f27b14b
* commit '
065f27b14bb99592a8aa9002d238b7f3ab031b69':
Change-Id: Ife8809f1749868c99af377611240ff46322e5e5a
TreeHugger Robot [Tue, 3 May 2016 19:43:29 +0000 (19:43 +0000)]
Merge "Null check intent before starting "learn more"." into nyc-mr1-dev
Jason Monk [Tue, 3 May 2016 19:42:19 +0000 (19:42 +0000)]
Merge "Fix leaks" into nyc-dev am:
ea8ee68507
am:
639ed29bae
* commit '
639ed29bae86891616643d00ffe143639e9cbb41':
Fix leaks
Change-Id: Ib37a585ad37575abe7ef04f3c7d4b3024210738e
Jason Monk [Tue, 3 May 2016 19:39:59 +0000 (19:39 +0000)]
Merge "Fix leaks" into nyc-dev
am:
ea8ee68507
* commit '
ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
Fix leaks
Change-Id: Ibf93ffeda0bca5e554da3462647ba207d0f9653f
Jason Monk [Tue, 3 May 2016 19:39:59 +0000 (19:39 +0000)]
Merge "Fix leaks" into nyc-dev
am:
ea8ee68507
* commit '
ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
Fix leaks
Change-Id: I5fffa584a7e265533c17b341636421ee99d4812c
Jason Monk [Tue, 3 May 2016 19:36:34 +0000 (19:36 +0000)]
Merge "Fix leaks" into nyc-dev
Jason Monk [Tue, 3 May 2016 19:24:05 +0000 (15:24 -0400)]
Fix leaks
Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes:
28074995
Jason Monk [Tue, 3 May 2016 18:45:41 +0000 (18:45 +0000)]
Merge "Try to fix receiver crash" into nyc-dev am:
5a2d6800b6
am:
bf96779cbf
* commit '
bf96779cbf24603de712856d6b646e30586714d7':
Change-Id: I0e224054779528a95e4fdb0c3e5d53455584878b
Jason Monk [Tue, 3 May 2016 18:44:38 +0000 (18:44 +0000)]
Merge "Try to fix receiver crash" into nyc-dev am:
5a2d6800b6
am:
508e93babd
* commit '
508e93babdab9cde97721670bbcd0fbc4a5a1e28':
Try to fix receiver crash
Change-Id: I9f839090a913905358283f15a6930446209078c4
Jason Monk [Tue, 3 May 2016 18:42:10 +0000 (18:42 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
am:
5a2d6800b6
* commit '
5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
Try to fix receiver crash
Change-Id: I3c2bb9113fbd9599450a011836881e91dbfd8270
Jason Monk [Tue, 3 May 2016 18:42:05 +0000 (18:42 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
am:
5a2d6800b6
* commit '
5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
Try to fix receiver crash
Change-Id: I641c41d7833bb8104f722889c123d1fe2447f6e7
Michael Wright [Tue, 3 May 2016 18:39:09 +0000 (18:39 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev am:
12c2c2538b
am:
e71a6ac6cd
* commit '
e71a6ac6cdcbca69a0f759211b8a08724b7701d8':
Change-Id: I5761dcceb05a7dea7e7d212fa7c7cf765be956d0
Jason Monk [Tue, 3 May 2016 18:37:23 +0000 (18:37 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
Michael Wright [Tue, 3 May 2016 18:36:48 +0000 (18:36 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev am:
12c2c2538b
am:
df824969af
* commit '
df824969af786598f951830bd6ec387606da316a':
Add subtext for default keyboard layout.
Change-Id: I3f2802ca95c8c0b95967dd52fdc664544f6eeccf
Michael Wright [Tue, 3 May 2016 18:34:18 +0000 (18:34 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev
am:
12c2c2538b
* commit '
12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.
Change-Id: Idd3946011f5f516c444973ce0f06381efe44cda9
Michael Wright [Tue, 3 May 2016 18:34:17 +0000 (18:34 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev
am:
12c2c2538b
* commit '
12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.
Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
Michael Wright [Tue, 3 May 2016 18:28:59 +0000 (18:28 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev
Michael Wright [Tue, 3 May 2016 13:32:32 +0000 (14:32 +0100)]
Add subtext for default keyboard layout.
Bug:
27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2
Jason Monk [Tue, 3 May 2016 18:25:56 +0000 (14:25 -0400)]
Try to fix receiver crash
Change-Id: I98fcde7f4595d0bf90bf2a2b8ba96cb96519a008
Fixes:
28554650
Andrew Sapperstein [Tue, 3 May 2016 01:28:21 +0000 (18:28 -0700)]
Null check intent before starting "learn more".
It is possible in certain build configurations to have an invalid
link. Instead of crashing, swallow the error and write to logs.
BUG:
28381984
Change-Id: I19f20b96afb42758187707f1b86a5817e8d737a8
Tony Mak [Tue, 3 May 2016 17:55:41 +0000 (18:55 +0100)]
Add managed profile setting page
Bug:
28281560
Change-Id: I1187f834dd9d002ec898a7d343198025963d1c26
Baligh Uddin [Tue, 3 May 2016 16:54:27 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
e6a875576f -s ours
am:
5c4e2d741a -s ours
* commit '
5c4e2d741a296a7da00e94bafa70b191e9702fed':
Change-Id: Ia43a5b595a0807dfc59135010925f6254a2fe723
Baligh Uddin [Tue, 3 May 2016 16:54:25 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ad4773b774 -s ours
* commit '
ad4773b774d905bfcccc3d1dbb45d0f0c27bc12e':
Import translations. DO NOT MERGE
Change-Id: Ia1afdb49580d23fbe60f22f458d169c62bea1e3b
Baligh Uddin [Tue, 3 May 2016 16:51:27 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
e6a875576f -s ours
am:
8c648f3fd5 -s ours
* commit '
8c648f3fd5b3dc776f52a72b4d248cfa0baba655':
Import translations. DO NOT MERGE
Change-Id: I49326528232aaac98c1b6830bc35505ff86ccbfc
Baligh Uddin [Tue, 3 May 2016 16:49:06 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
e6a875576f -s ours
* commit '
e6a875576f3713c755c5bbca855b43b1048b3618':
Import translations. DO NOT MERGE
Change-Id: Ia280336dd979aee7c6faf76fc77bef275f2b6285
Baligh Uddin [Tue, 3 May 2016 16:49:04 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
e6a875576f -s ours
* commit '
e6a875576f3713c755c5bbca855b43b1048b3618':
Import translations. DO NOT MERGE
Change-Id: I54dbc26d0afdd735fb798eefd4eab6d3a3773aa1
Baligh Uddin [Tue, 3 May 2016 16:41:20 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Baligh Uddin [Tue, 3 May 2016 16:41:17 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Robin Lee [Tue, 3 May 2016 12:27:05 +0000 (13:27 +0100)]
Add lockdownEnabled parameter to always-on VPN API
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.
Bug:
26694104
Change-Id: Ic2c25b79d8a17917025eb37be7de929fe156e2a3
Baligh Uddin [Tue, 3 May 2016 08:39:46 +0000 (01:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief7fdf92fd579e99764edbf2438caa44d6735da7
Auto-generated-cl: translation import
Baligh Uddin [Tue, 3 May 2016 08:25:52 +0000 (01:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: If49388814aafcf05ad9b1899b7e991463c8c3662
Auto-generated-cl: translation import
Android Build Merger (Role) [Mon, 2 May 2016 23:30:38 +0000 (23:30 +0000)]
Merge "Merge "Read disk ID from intent" into nyc-dev am:
e0e7fa4501 am:
fe99c4282e" into nyc-mr1-dev-plus-aosp
Philip P. Moltmann [Mon, 2 May 2016 23:30:32 +0000 (23:30 +0000)]
Merge "Read disk ID from intent" into nyc-dev am:
e0e7fa4501
am:
fe99c4282e
* commit '
fe99c4282e8e8a057c9519b93640c09ffe8e628a':
Change-Id: Ice23b0a3c9fc625f378e9073bdd2c12f2b2e51a3
Android Build Merger (Role) [Mon, 2 May 2016 23:29:54 +0000 (23:29 +0000)]
Merge "Merge "Read disk ID from intent" into nyc-dev am:
e0e7fa4501 am:
fe99c4282e" into nyc-mr1-dev-plus-aosp
Philip P. Moltmann [Mon, 2 May 2016 23:29:45 +0000 (23:29 +0000)]
Merge "Read disk ID from intent" into nyc-dev am:
e0e7fa4501
am:
fe99c4282e
* commit '
fe99c4282e8e8a057c9519b93640c09ffe8e628a':
Read disk ID from intent
Change-Id: Ifb0d8f693059943f78e07ff90bec8b355998b23e