drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
352,862 Commits 1 Branch 0 Tags
Commit Graph

352862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chrison.chai
e9940be86d Merge "Fix random systemui crashes during cts test DO NOT MERGE" 
am: d8514e82aa  -s ours

Change-Id: Ib0b5affb287771dfc965ebe0a05791849aa919c8
 2017-12-21 19:14:40 +00:00
TreeHugger Robot
e1a67faba3 Merge "Using new usbhost function usb_device_get_string_ucs2() to get USB descriptor strings." 2017-12-21 19:14:37 +00:00
Bill Yi
5f38be9fdb Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours am: 2d00ab621a -s ours am: e135a35edf -s ours 
am: 301dfae698  -s ours

Change-Id: I47dc0cc519fd0707c83e3aab976934b3b3ce2150
 2017-12-21 19:13:50 +00:00
Philip P. Moltmann
b42cd23425 Merge "Testables lib should not statically link mockito" 
am: 47d04fc5c0

Change-Id: I4aee182a94fa62a8a254f0bbc480b4de1a4ed688
 2017-12-21 19:12:57 +00:00
Bill Yi
50f7d64f05 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours am: c81e5ae281 -s ours am: 13062c93e5 -s ours 
am: 25d7b576ec  -s ours

Change-Id: Iaf6c344263bc6d3e32f0df8d14cc27327a30b3ec
 2017-12-21 19:12:14 +00:00
Arthur Ishiguro
9b9c9d85e8 Adds a createClient method with no Executor argument 
Bug: 67734082
Test: make
Change-Id: Id2d6cb6d125ed0f58ebafc5d6e45aff4408595bf
 2017-12-21 11:03:50 -08:00
Arthur Ishiguro
e35a6debaa Replace Handler with Executor in new APIs 
To conform with new API guideline L1 in go/android-api-guidelines.

Bug: 67734082
Test: make
Change-Id: Ib18e778368dc95c69cdec4faed6dd34cbabdf1a4
 2017-12-21 11:03:49 -08:00
Etan Cohen
6c4f2de95a Merge "[AWARE] Check dynamic location permission" 2017-12-21 18:47:46 +00:00
Robert Berry
692dbe82df Merge "Add userId to RecoverableKeyStoreDb" 2017-12-21 18:42:37 +00:00
Holly Jiuyu Sun
a2b23916c0 Add asn1 to platform. 
Add unit test.

Bug: 38206971
Test: unit test
Change-Id: I140b74b6bda263a4044aaed7265de3c77d1adc63
Merged-In: Ifb7c7d13ad0f980ba986b3aa6c3213ad26658489
 2017-12-21 10:39:26 -08:00
Ivan Lozano
0e603f03e6 Merge "Fix doFadingAnimationLocked in sanitized builds." 2017-12-21 18:29:00 +00:00
Jiuyu Sun
bc610e1432 Merge "Add asn1 to platform." 2017-12-21 18:28:36 +00:00
goneil
c57be8083e Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis 
Also make the possible SIM_ACTIVATION_STATE parameters @SystemAPIs

Bug: 67750905
Test: TelephonyManagerTests#test{Voice/Data}ActivationState
Change-Id: Ib2c672db1e78afdbc25c4d36da478c3b88ffe232
 2017-12-21 10:22:10 -08:00
Bill Yi
f0687d1201 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am: 0a1948e515 -s ours 
am: 7cb6513f6d  -s ours

Change-Id: I9cf46be95cd8d62bd8380b63740e4d97b68fa958
 2017-12-21 18:18:04 +00:00
Bill Yi
7cb6513f6d Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours 
am: 0a1948e515  -s ours

Change-Id: If6c330da79edb94911ec1fb076a29e8c485ca725
 2017-12-21 18:15:02 +00:00
abdalkader
2bf7f03e63 Merge "SMS over IMS APIs revision" 2017-12-21 18:12:07 +00:00
Bill Yi
0a1948e515 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 45d962274f  -s ours

Change-Id: I43d3d8e14417f7aed30a470191386753c9957701
 2017-12-21 18:11:27 +00:00
TreeHugger Robot
45d962274f Merge "Import translations. DO NOT MERGE" into cw-f-dev 2017-12-21 18:04:34 +00:00
Bill Yi
1f9ae3b912 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours am: ea2e302eff -s ours 
am: b6dab6b3ee  -s ours

Change-Id: Ic796115ab4b86083a0823a4ace631c8a3a15ba66
 2017-12-21 18:01:15 +00:00
Bill Yi
b6dab6b3ee Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours 
am: ea2e302eff  -s ours

Change-Id: I9d23c6267a38545927029782293ef8a15961cca7
 2017-12-21 17:57:41 +00:00
Bill Yi
b7a560fb10 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours am: d21211470c -s ours 
am: f1c75d66ec  -s ours

Change-Id: Iaae57c91c09a4b1780c0c8e474700c56133b264e
 2017-12-21 17:57:33 +00:00
Andrew Solovay
1d47305bfe Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev am: 7835c650b2 
am: 7ad3eb8db0  -s ours

Change-Id: Ib0b4de07702d6a7337e47f72fe1b5d31039a5454
 2017-12-21 17:56:48 +00:00
Bill Yi
f6c335b353 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am: d5a7faea83 -s ours 
am: bd14c44fd8  -s ours

Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8
 2017-12-21 17:55:45 +00:00
Treehugger Robot
89bb1971d0 Merge "Add Notification Flag behavior test" 2017-12-21 17:54:34 +00:00
Bill Yi
adf1d69168 Import translations. DO NOT MERGE am: 406659b709 -s ours am: 1fccf167ff -s ours am: daa1d87e50 -s ours am: 0e62ea2f4c -s ours am: c5dff435b0 -s ours 
am: 16a7391b2a  -s ours

Change-Id: I5a1fa1ae1bd8cf10fe404fc43f0e5e3357d48af1
 2017-12-21 17:53:27 +00:00
Bill Yi
39d480e67c Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours am: 51fc07ad61 -s ours 
am: c344f9b1c7  -s ours

Change-Id: I0f33f5e6ba5168e27ed60cb36b762708b641d34a
 2017-12-21 17:52:15 +00:00
Bill Yi
f1c75d66ec Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours 
am: d21211470c  -s ours

Change-Id: Ife7d7f70c599c556abebf10eee525072a127b34d
 2017-12-21 17:51:21 +00:00
Bill Yi
934729c535 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours am: 5943ef281a -s ours 
am: 2c97ca3b62  -s ours

Change-Id: Ia71bb418e6bf22e2347436d883e1bcd1c9937d61
 2017-12-21 17:50:54 +00:00
Bill Yi
bd14c44fd8 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours 
am: d5a7faea83  -s ours

Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab
 2017-12-21 17:50:03 +00:00
Tony Mantler
47394cdbb8 Move ServiceListing to SettingsLib and add tests 
Bug: 70902607
Test: RunSettingsLibRoboTests
Change-Id: I172092f8c249e76667136442080d5fd7a6a6ef01
 2017-12-21 09:49:30 -08:00
Bill Yi
c344f9b1c7 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours 
am: 51fc07ad61  -s ours

Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8
 2017-12-21 17:48:29 +00:00
Bill Yi
ea2e302eff Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 81b98ffb09  -s ours

Change-Id: I6369ce728c37d066932736566e465f73e7843eb5
 2017-12-21 17:46:04 +00:00
Bill Yi
d21211470c Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 599fb37c01  -s ours

Change-Id: Icc605bca96905c647601df651186850c874b5442
 2017-12-21 17:44:40 +00:00
Bill Yi
f123f221db Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am: a683975c54 -s ours 
am: 0bfcd7eef7  -s ours

Change-Id: I30395fbf54d028c4f2e8bd21aa362e9d8e993195
 2017-12-21 17:44:38 +00:00
Andrew Solovay
7ad3eb8db0 Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev 
am: 7835c650b2

Change-Id: I662ac186b079d88fc503fa546b52b1297b98a036
 2017-12-21 17:42:46 +00:00
Bill Yi
d5a7faea83 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: e1ca34b5c7  -s ours

Change-Id: Ie97a72b89d17e982dbe499c26c956dafffe5effa
 2017-12-21 17:42:25 +00:00
Bill Yi
2c97ca3b62 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours 
am: 5943ef281a  -s ours

Change-Id: I9758d713fb9328b7f2218dae49e334f16a703476
 2017-12-21 17:42:12 +00:00
Bill Yi
7baaa51e62 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours am: 7244723549 -s ours 
am: 05e41d0531  -s ours

Change-Id: I730f5dcee5ea85c408f7cf21dafab011e869d66d
 2017-12-21 17:42:08 +00:00
Sanket Padawe
151c15445a Merge "Receiving side Call handover API implementation." 
am: 3c7bc2dc06

Change-Id: I7badcfaf9d308fb05745b0f37ee99603f5eee1c2
 2017-12-21 17:41:40 +00:00
Bill Yi
51fc07ad61 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 7ce772e941  -s ours

Change-Id: I0a8e327692fb18d67b9e724ce3254f3c342206b9
 2017-12-21 17:41:01 +00:00
Chenbo Feng
fa7f4015fc Merge "Use NetworkStatsService to get stats for apps" 
am: 693d8a2ab1

Change-Id: I81a28a172e69fc405e99eb9c3a4fd0c729ca613d
 2017-12-21 17:38:12 +00:00
Bill Yi
0bfcd7eef7 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours 
am: a683975c54  -s ours

Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3
 2017-12-21 17:37:26 +00:00
Bill Yi
301dfae698 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours am: 2d00ab621a -s ours 
am: e135a35edf  -s ours

Change-Id: Ib75ec7b79501a31cab373f919c06a791a7ad9a4a
 2017-12-21 17:35:51 +00:00
Fan Zhang
3b8a596f05 Merge "Enable settings search v2 experiement" 2017-12-21 17:29:32 +00:00
TreeHugger Robot
b1bd89a877 Merge "Allow system server to query local WiFi MAC address" 2017-12-21 17:20:04 +00:00
Phil Weaver
271bdbf9f9 Merge "Fix accessibility reporting for lock screen PIN" 2017-12-21 17:12:29 +00:00
TreeHugger Robot
0ce51f60b4 Merge "Added @TestApi on new Autofill settings for field classification." 2017-12-21 17:12:12 +00:00
Paul McLean
6dfa25aa3f Using new usbhost function usb_device_get_string_ucs2() to get USB descriptor strings. 
Bug: 70163357
Test: Manual - Connect NuForce (micro) DAC. Examine device name descriptor string.
Note also that it doesn't reboot the device on connection. Verify that audio
plays correctly.

Change-Id: I4b607c51a951cf503fde0b485793dfc9e593f932
 2017-12-21 10:54:38 -06:00
Ivan Lozano
7f71764ce6 Fix temporary file name strlcpy size. 
The strlcpy size argument overflows on integer sanitized builds.

 runtime error: unsigned integer overflow: 11 - 35 cannot be represented
 in type 'unsigned long'

This doesn't cause a problem because strlcpy stops on the null in
TMP_FILE_PATTERN, and localTmpFileName is defined large enough to
contain TMP_FILE_PATTERN.

This changes the size argument to the remaining length in the buffer,
and removes an extraneous '/' write as TMP_FILE_PATTERN already begins
with '/'.

Bug: 30969751
Test: Reran CTS test which triggered the overflow.

Change-Id: I20b5deeaaa1a863324dfd1d94f3135920eae48d3
Merged-In: I20b5deeaaa1a863324dfd1d94f3135920eae48d2
(cherry picked from commit 62fc14894b32f35641ae2b61ef7ed054c9660288)
 2017-12-21 08:15:35 -08:00
Naomi Musgrave
d7dd779ec2 Merge "Add id to SecurityEvent." 2017-12-21 16:09:32 +00:00