Bill Yi
9ce91ecb0f
Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188 -s ours
...
am: b925300049
2016-06-01 15:35:44 +00:00
Bill Yi
ba4dfdf8c1
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: da38e871de -s ours" into nyc-mr1-dev-plus-aosp
...
am: 3856317f50
2016-06-01 15:31:04 +00:00
Bill Yi
9ce895e8a7
Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188 -s ours am: 11c16c1256 -s ours
...
am: 9fbda9f906
2016-06-01 15:31:02 +00:00
Android Build Merger (Role)
3856317f50
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: da38e871de -s ours" into nyc-mr1-dev-plus-aosp
2016-06-01 15:26:49 +00:00
Bill Yi
6401220f84
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: da38e871de
2016-06-01 15:26:32 +00:00
Bill Yi
9fbda9f906
Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188 -s ours
...
am: 11c16c1256
2016-06-01 15:26:30 +00:00
Bill Yi
b925300049
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: fb9e8e3188
2016-06-01 15:22:23 +00:00
Bill Yi
11c16c1256
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: fb9e8e3188
2016-06-01 15:22:22 +00:00
TreeHugger Robot
ef64a8f89d
Merge "Import translations. DO NOT MERGE"
2016-06-01 15:18:37 +00:00
TreeHugger Robot
fb9e8e3188
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-01 15:14:12 +00:00
TreeHugger Robot
da38e871de
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-01 15:12:42 +00:00
Robin Lee
f64c766d33
Merge "Disable restricted VPN actions onResume am: 52541536d0 am: 8a8f3f2f34" into nyc-mr1-dev-plus-aosp
...
am: d3dc50ceb1
2016-06-01 14:30:50 +00:00
Robin Lee
3682dd09e6
Disable restricted VPN actions onResume am: 52541536d0 am: 849edeb23e
...
am: 93e8676ecc
2016-06-01 14:30:49 +00:00
Android Build Merger (Role)
d3dc50ceb1
Merge "Disable restricted VPN actions onResume am: 52541536d0 am: 8a8f3f2f34" into nyc-mr1-dev-plus-aosp
2016-06-01 14:26:33 +00:00
Robin Lee
93e8676ecc
Disable restricted VPN actions onResume am: 52541536d0
...
am: 849edeb23e
2016-06-01 14:26:19 +00:00
Robin Lee
5aa8a34802
Disable restricted VPN actions onResume am: 52541536d0
...
am: 8a8f3f2f34
2016-06-01 14:26:18 +00:00
Robin Lee
8a8f3f2f34
Disable restricted VPN actions onResume
...
am: 52541536d0
2016-06-01 14:22:07 +00:00
Robin Lee
849edeb23e
Disable restricted VPN actions onResume
...
am: 52541536d0
2016-06-01 14:22:07 +00:00
Bill Yi
d3cf866b7c
Import translations. DO NOT MERGE
...
Change-Id: I6e36edcd4fa922050390eb4f0e934b910b0a33c6
Auto-generated-cl: translation import
2016-06-01 06:40:08 -07:00
Bill Yi
824b1f09f7
Import translations. DO NOT MERGE
...
Change-Id: I19e1428a2e4ec2971c4aa611345a3372cc7ef4e3
Auto-generated-cl: translation import
2016-06-01 06:23:22 -07:00
Bill Yi
177eb426c1
Import translations. DO NOT MERGE
...
Change-Id: Ie52cf27f9003c53990a2ac475b59ffdb18add7aa
Auto-generated-cl: translation import
2016-06-01 05:34:58 -07:00
Robin Lee
52541536d0
Disable restricted VPN actions onResume
...
Otherwise it's pretty easy to circumvent any future restrictions by
keeping VPN settings for a particular app open and continuing to use
it even after DISALLOW_CONFIG_VPN is applied.
Two checks:
1) in onResume (catches almost every case)
2) in setAlwaysOn (catches every remaining case)
Bug: 28733079
Change-Id: I1c67bb14891ef620df5ed65fbd32678e417b4a65
2016-06-01 11:32:32 +01:00
Victor Chang
54825c2ee0
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 am: 7a37b70bda
...
am: fc9cbd17f3
2016-06-01 10:22:45 +00:00
Victor Chang
13adfba9ad
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854 am: 5ab70294ed
...
am: 24b39dce00
2016-06-01 10:22:44 +00:00
Victor Chang
fc9cbd17f3
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854
...
am: 7a37b70bda
2016-06-01 10:18:27 +00:00
Victor Chang
24b39dce00
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev am: 36522e8854
...
am: 5ab70294ed
2016-06-01 10:18:07 +00:00
Victor Chang
5ab70294ed
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
...
am: 36522e8854
2016-06-01 10:13:52 +00:00
Victor Chang
7a37b70bda
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
...
am: 36522e8854
2016-06-01 10:13:51 +00:00
Victor Chang
36522e8854
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
2016-06-01 10:07:16 +00:00
Tony Mak
cf55f787a9
Merge "Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: 0b86c6bcc6" into nyc-mr1-dev-plus-aosp
...
am: 7d3cd0b1d3
2016-06-01 09:52:49 +00:00
Tony Mak
94f187e0b4
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: caeb93ceda
...
am: 2abfd032d5
2016-06-01 09:52:48 +00:00
Android Build Merger (Role)
7d3cd0b1d3
Merge "Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: 0b86c6bcc6" into nyc-mr1-dev-plus-aosp
2016-06-01 09:48:40 +00:00
Tony Mak
2abfd032d5
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156
...
am: caeb93ceda
2016-06-01 09:48:27 +00:00
Tony Mak
ed66066174
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156
...
am: 0b86c6bcc6
2016-06-01 09:48:27 +00:00
Tony Mak
caeb93ceda
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
...
am: ffb10f8156
2016-06-01 09:44:06 +00:00
Tony Mak
0b86c6bcc6
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
...
am: ffb10f8156
2016-06-01 09:44:06 +00:00
Tony Mak
ffb10f8156
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
2016-06-01 09:36:51 +00:00
宋凯伦
0fb2f2bd00
Fix the memory leak in TetherSettings
...
https://code.google.com/p/android/issues/detail?id=210848
We need to close the bluetooth adapter's profile proxy in OnDestroy
method, or it will cause TetherSettings object to be held and won't
release. And finally it will cause OOM issue.
Change-Id: Id7667f751697c8ef9fccaaabfed28a91d4fa4960
Signed-off-by: 宋凯伦 <songkailun@xiaomi.com >
2016-06-01 02:13:50 +00:00
Meng Wang
fddffa539d
Launch E911 address management activity at turning on Wifi Calling am: 90e8e4713c
...
am: 0500f2bede
2016-06-01 00:57:14 +00:00
Meng Wang
0500f2bede
Launch E911 address management activity at turning on Wifi Calling
...
am: 90e8e4713c
2016-06-01 00:46:33 +00:00
Meng Wang
90e8e4713c
Launch E911 address management activity at turning on Wifi Calling
...
Bug: 28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f
2016-05-31 15:57:27 -07:00
Victor Chang
71d1fed0e7
Show different strings when PO/DO user approves a cert
...
1. This is confusing for restricted users who don't have any options other
than 'Trust'.
2. show dialog title of "Check certificate" instead of "Trust or remove certificate"
The change only applies to ProfileOwner and DeviceOwner case
Fix: 28875819
Change-Id: I3f7dc8f3dcac75b4d99814cbc9af67433676a8c7
2016-05-31 22:43:09 +01:00
Tony Mak
fe0ce01da7
Fix RTL issue in Trusted Credentail page
...
Two changes are required to fix the issue.
1. The width of the textview needed to be wrap_content in order
to resolve the random issue. I guess it is a framework bug, but
anyway the UI looks the same after the change
2. textAlignment="viewStart" is needed to make the textview RTL
3. Clean up: Change the RelativeLayout to a vertical LinearLayout
Bug: 28757193
Change-Id: I1142d4dd31eb86b80f5a2316c1c7825df287b609
2016-05-31 19:53:49 +00:00
Jason Monk
a4bc49e55e
Fix some top-level settings not updating with language
...
They need to be resources so they can load correctly on locale
change.
Change-Id: Iea167b8df411528185987d37704717d9c0b9f254
Fixes: 28861758
2016-05-31 14:49:03 -04:00
Andrew Sapperstein
15b78d8f19
Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev am: 9ca09c020e
...
am: 59358568d0
2016-05-31 18:46:26 +00:00
Andrew Sapperstein
59358568d0
Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev
...
am: 9ca09c020e
2016-05-31 18:43:59 +00:00
Andrew Sapperstein
9ca09c020e
Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev
2016-05-31 18:38:07 +00:00
Daniel Nishi
b6b9d830d6
Merge "Add an automatic storage management job service." into nyc-mr1-dev am: d7efefa503
...
am: f878423e3d
2016-05-31 18:33:56 +00:00
Daniel Nishi
f878423e3d
Merge "Add an automatic storage management job service." into nyc-mr1-dev
...
am: d7efefa503
2016-05-31 18:31:32 +00:00
Daniel Nishi
d7efefa503
Merge "Add an automatic storage management job service." into nyc-mr1-dev
2016-05-31 18:25:18 +00:00
