Nicolas Prevot
56400a445f
Check user restriction DISALLOW_REMOVE_USER in isProvisioningAllowed.
...
If DISALLOW_REMOVE_USER is set and there is already a managed profile:
isProvisioningAllowed() should return false
BUG:32629873
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I093bed0a4a54f83decf11716ebfd50dd4f17c089
2016-11-16 12:12:41 +00:00
TreeHugger Robot
2cf7c483a8
Merge "Not create document under the device."
2016-11-07 06:21:48 +00:00
Seigo Nonaka
4b56177429
Merge "Make sure the Typeface is loaded before calling measureText."
2016-11-07 05:22:52 +00:00
Hugo Benichi
3bbe9ab6b8
Merge "Netd events: record connect() success/errno"
2016-11-07 04:07:13 +00:00
Daichi Hirono
35b2ec551f
Not create document under the device.
...
The structure of files in MtpDocumentsProvider looks like
/device/storage/files. But MtpDocumentsProvider shows files
just under the device if the device has only single storage.
It causes a problem that MtpDocumentsProvider tries to create a file
under the device. Previously it tries to create a file with storageId =
0, which means MTP device choose a storage to store the file.
Because it only happens when the device has a single storage, the file
is properly written to the device. But the database in
MtpDocumentsProvider goes into the illegal state where the file is
placed just under the device.
Bug: 32561572
Test: adb shell am instrument -w -e class com.android.mtp.MtpDocumentsProviderTest com.android.mtp.tests/com.android.mtp.TestResultInstrumentation
Change-Id: I47a373ceee8a64ba9995934317693e79d2497ee0
2016-11-07 10:29:09 +09:00
Hugo Benichi
19dfc38434
Merge "frameworks-test: adding missing @SmallTest"
2016-11-07 00:09:56 +00:00
Etan Cohen
883461a6d4
Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101 am: a99a05982e
...
am: 2ad6b14d50
2016-11-06 03:38:18 +00:00
Etan Cohen
2ad6b14d50
Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101
...
am: a99a05982e
2016-11-06 03:29:40 +00:00
Etan Cohen
a99a05982e
Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8
...
am: 6571007101
2016-11-06 03:21:37 +00:00
Etan Cohen
6571007101
Merge "[NAN-AWARE] Rename NAN to Aware"
...
am: 74b1131cc8
2016-11-06 03:13:31 +00:00
Etan Cohen
74b1131cc8
Merge "[NAN-AWARE] Rename NAN to Aware"
2016-11-06 03:05:40 +00:00
Etan Cohen
0849ded008
[NAN-AWARE] Rename NAN to Aware
...
~Rename only (and any reformatting needed to pass lint) - no
functional changes!
Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.
(cherry-pick of commit a61b9fb569
2016-11-05 09:41:38 -07:00
Etan Cohen
3a1dd86ce4
Merge "[NAN-AWARE] Rename NAN to Aware"
2016-11-05 16:19:43 +00:00
Bill Yi
935e92acb9
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 42f6ca6097 -s ours
...
am: cc65f0761d
2016-11-05 06:51:30 +00:00
Bill Yi
c5c08983b2
Import translations. DO NOT MERGE am: 6b7911ae4c -s ours
...
am: 239809dea8
2016-11-05 06:50:41 +00:00
Bill Yi
38fa537dc0
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 1b93d5c5a1 -s ours
...
am: 8e4618bca6
2016-11-05 06:49:49 +00:00
Bill Yi
2a98ad003b
Import translations. DO NOT MERGE am: a5753cef6e -s ours
...
am: 98d19da3d7
2016-11-05 06:48:58 +00:00
Bill Yi
38c2817cde
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: b14995516a -s ours
...
am: 9fbeb40fc9
2016-11-05 06:47:55 +00:00
Bill Yi
da60d2b57b
Import translations. DO NOT MERGE am: 4d67c3b986 -s ours
...
am: 34485976f4
2016-11-05 06:47:04 +00:00
Bill Yi
b8984eeb1c
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 86875e592a -s ours
...
am: fbe8eef154
2016-11-05 06:46:11 +00:00
Bill Yi
02a7c2e603
Import translations. DO NOT MERGE am: d6a229b64c -s ours
...
am: 77cf704647
2016-11-05 06:45:22 +00:00
Bill Yi
bd661b9ce6
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 53c2954e4e -s ours
...
am: 8d518cac98
2016-11-05 06:44:31 +00:00
Bill Yi
54ed28dab6
Import translations. DO NOT MERGE am: 92ba705e9f -s ours
...
am: c7bfce0dda
2016-11-05 06:43:41 +00:00
Bill Yi
e8f8c0f628
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: dfe1833475 -s ours
...
am: e8dff1a5bd
2016-11-05 06:42:50 +00:00
Bill Yi
37d7e0ba65
Import translations. DO NOT MERGE am: 66333161bb -s ours
...
am: 77b50cef75
2016-11-05 06:41:59 +00:00
Bill Yi
c1181542c9
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: b26e27dc4a -s ours
...
am: f6e16b8604
2016-11-05 06:36:57 +00:00
Bill Yi
88a2847268
Import translations. DO NOT MERGE am: 0c1f10dd0c -s ours
...
am: eff51c8add
2016-11-05 06:36:04 +00:00
Bill Yi
cc65f0761d
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 42f6ca6097
2016-11-05 06:35:38 +00:00
Bill Yi
239809dea8
Import translations. DO NOT MERGE
...
am: 6b7911ae4c
2016-11-05 06:35:34 +00:00
Bill Yi
2e85fedddb
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 04812a6025 -s ours
...
am: 7d0d794b6d
2016-11-05 06:35:18 +00:00
Bill Yi
e7efc13c55
Import translations. DO NOT MERGE am: b95efc83d1 -s ours
...
am: 6a928ed074
2016-11-05 06:34:29 +00:00
Bill Yi
8e4618bca6
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 1b93d5c5a1
2016-11-05 06:34:16 +00:00
Bill Yi
98d19da3d7
Import translations. DO NOT MERGE
...
am: a5753cef6e
2016-11-05 06:34:12 +00:00
Bill Yi
9c7e0654d0
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 79de6da289 -s ours
...
am: e8dba1f819
2016-11-05 06:33:32 +00:00
Bill Yi
9fbeb40fc9
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: b14995516a
2016-11-05 06:32:51 +00:00
Bill Yi
34485976f4
Import translations. DO NOT MERGE
...
am: 4d67c3b986
2016-11-05 06:32:45 +00:00
Bill Yi
4b0eeddad2
Import translations. DO NOT MERGE am: fa38b27d50 -s ours
...
am: 345d96ec9d
2016-11-05 06:32:37 +00:00
Bill Yi
710eb2fe9d
Import translations. DO NOT MERGE am: c08a721c3a -s ours
...
am: 10f695e379
2016-11-05 06:31:41 +00:00
Bill Yi
fbe8eef154
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 86875e592a
2016-11-05 06:31:33 +00:00
Bill Yi
77cf704647
Import translations. DO NOT MERGE
...
am: d6a229b64c
2016-11-05 06:31:29 +00:00
Bill Yi
8d518cac98
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 53c2954e4e
2016-11-05 06:30:05 +00:00
Bill Yi
c7bfce0dda
Import translations. DO NOT MERGE
...
am: 92ba705e9f
2016-11-05 06:30:01 +00:00
Bill Yi
e8dff1a5bd
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: dfe1833475
2016-11-05 06:28:33 +00:00
Bill Yi
77b50cef75
Import translations. DO NOT MERGE
...
am: 66333161bb
2016-11-05 06:28:27 +00:00
Bill Yi
f6e16b8604
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: b26e27dc4a
2016-11-05 06:27:05 +00:00
Bill Yi
eff51c8add
Import translations. DO NOT MERGE
...
am: 0c1f10dd0c
2016-11-05 06:26:59 +00:00
Bill Yi
7d0d794b6d
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 04812a6025
2016-11-05 06:24:03 +00:00
Bill Yi
6a928ed074
Import translations. DO NOT MERGE
...
am: b95efc83d1
2016-11-05 06:23:53 +00:00
Bill Yi
e8dba1f819
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 79de6da289
2016-11-05 06:22:12 +00:00
Bill Yi
345d96ec9d
Import translations. DO NOT MERGE
...
am: fa38b27d50
2016-11-05 06:22:02 +00:00
