Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
515,324 Commits 3 Branches 0 Tags
df647b5aa28317b4f7c8b0dfbbdaa570626dee89
Commit Graph

515324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
df647b5aa2 [automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5caa -s ours am: 40f9b161e8 -s ours 
am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 e6317e5caa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906

Change-Id: I7295de91e3261861fef8bace9cf3e345197e43ee
 2020-07-13 13:43:10 +00:00
Treehugger Robot
e8c6a3b530 [automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5caa am: 241609e5d2 -s ours 
am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 e2d85f644a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906

Change-Id: I05505eaaefe7d638a1208e23994c41617ceba60b
 2020-07-13 13:42:57 +00:00
Treehugger Robot
40f9b161e8 [automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5caa -s ours 
am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 e2d85f644a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906

Change-Id: I0fd07b73d41f14cd62d208ea7434a5c8f74b7ce3
 2020-07-13 13:30:50 +00:00
Treehugger Robot
241609e5d2 Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5caa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906

Change-Id: I55b776ef0ae16d0a762f10c979e1efb659200ad8
 2020-07-13 13:30:50 +00:00
vichang
fe1600c0db Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd am: f65666d055 am: f5ed148053 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356708

Change-Id: I41add09b9ba08cde5a6dd1a38e59a33dcaaacbcd
 2020-07-13 10:35:59 +00:00
vichang
f5ed148053 Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd am: f65666d055 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356708

Change-Id: Idd5d71f2d6b787ddbece60746c97dd2713ecc7cc
 2020-07-13 10:22:38 +00:00
vichang
f65666d055 Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356708

Change-Id: I1252a566bb306075cdfeff09415b85cf5557c792
 2020-07-13 10:11:19 +00:00
vichang
59d12aa8bd Merge changes from topic "DateUtilsBridge" 
* changes:
  Move/Copy some libcore.icu classes to android.text.format
  Copy some libcore.icu classes to android.text.format
 2020-07-13 10:02:16 +00:00
Treehugger Robot
e6317e5caa Fix EthernetTetheringTest failure if tethering is not supported 
Do not run ethernet tethering tests if tethering is not supported
because Tethering APIs would fail. Also skip the test if
EthernetManager is not avaliable. EthernetManager would be null if
there are no FEATURE_ETHERNET and FEATURE_USB_HOST.

Bug: 159869957
Test: atest CtsTetheringTest
Merged-In: I2b9be6799c6edeefc8cd74897a8704dbe80dd061
Change-Id: I2b9be6799c6edeefc8cd74897a8704dbe80dd061
 2020-07-13 10:01:25 +00:00
Treehugger Robot
3d2052416f Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: 6ad5decb8f am: f3cf2040b0 am: 0875fe5f4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244

Change-Id: I861bc25832f8e3ac436e8f0127aa0aed4f64ca8a
 2020-07-13 09:46:27 +00:00
Treehugger Robot
0875fe5f4f Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: 6ad5decb8f am: f3cf2040b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244

Change-Id: I6763589a3af8cd78efc53e0637ff4f9d6ebcef88
 2020-07-13 09:35:07 +00:00
Treehugger Robot
f3cf2040b0 Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: 6ad5decb8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244

Change-Id: I53b28c47dcf5c0590c02fc2f8f7c36a8323030d2
 2020-07-13 09:16:57 +00:00
Treehugger Robot
6ad5decb8f Merge "Fix EthernetTetheringTest failure if tethering is not supported" 2020-07-13 09:05:00 +00:00
Treehugger Robot
e8589e5764 Merge "Ignore invalid time stamp in SMS PDUs" am: a19cd20f01 am: 43887910a2 am: 2d017866f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354342

Change-Id: I46aedac870daecb3c7dedb1bf8eaa1ae051cb84b
 2020-07-13 08:57:33 +00:00
Treehugger Robot
2d017866f1 Merge "Ignore invalid time stamp in SMS PDUs" am: a19cd20f01 am: 43887910a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354342

Change-Id: I74bcc259c8764f969a7328ff97bec20aeeabf036
 2020-07-13 08:39:07 +00:00
Treehugger Robot
43887910a2 Merge "Ignore invalid time stamp in SMS PDUs" am: a19cd20f01 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354342

Change-Id: Ib4debefeae8f672e451aef562251dab32af851a9
 2020-07-13 08:25:31 +00:00
Treehugger Robot
a19cd20f01 Merge "Ignore invalid time stamp in SMS PDUs" 2020-07-13 08:10:24 +00:00
markchien
e2d85f644a Fix EthernetTetheringTest failure if tethering is not supported 
Do not run ethernet tethering tests if tethering is not supported
because Tethering APIs would fail. Also skip the test if
EthernetManager is not avaliable. EthernetManager would be null if
there are no FEATURE_ETHERNET and FEATURE_USB_HOST.

Bug: 159869957
Test: atest CtsTetheringTest
Change-Id: I2b9be6799c6edeefc8cd74897a8704dbe80dd061
 2020-07-13 15:24:45 +08:00
Treehugger Robot
5b147f3a76 Merge "StateMachine: check for null curState in dump()" am: 2ca1abc174 am: e12727ce1d am: 932962ac33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360902

Change-Id: I0023f1985526779e2423410ac740af239372aa26
 2020-07-13 02:40:57 +00:00
Shuo Qian
b0dbffdaa7 Merge "Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads." am: 02b664649a am: 1609733fae am: 47351ebc1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360883

Change-Id: Ia4ae72582206bb94f25872388b3ae6769b66a979
 2020-07-13 02:40:43 +00:00
Nathan Harold
a4570afac8 Merge "Deprecate CellLocation#requestLocationUpdate" am: 277f52a0f4 am: 3153f5efb9 am: ad12e8d8b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355809

Change-Id: Ia3400cc40de7e29c8e7c35714ea0502a39ab7a1f
 2020-07-13 02:40:24 +00:00
Nathan Harold
3f8242be66 [automerger skipped] Merge "Remove FIXME that getApnSetting should be NonNull" am: a0895c8580 am: a2f46553cf -s ours am: 697d925b09 -s ours 
am skip reason: Change-Id Ifd80f2859e4a090225aab1b3a483325d654a2412 with SHA-1 4005f21d68 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1261865

Change-Id: I6d37ddc82cf2b87b583ed2347d9a055621b99759
 2020-07-13 02:40:02 +00:00
Treehugger Robot
932962ac33 Merge "StateMachine: check for null curState in dump()" am: 2ca1abc174 am: e12727ce1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360902

Change-Id: Id0b084d4aae3dcb72203147f1cdeb2c98141d240
 2020-07-13 02:34:10 +00:00
Shuo Qian
47351ebc1b Merge "Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads." am: 02b664649a am: 1609733fae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360883

Change-Id: Ia8d0608b3ef8291030a8131b732dee2eff2c8745
 2020-07-13 02:33:38 +00:00
Nathan Harold
ad12e8d8b8 Merge "Deprecate CellLocation#requestLocationUpdate" am: 277f52a0f4 am: 3153f5efb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355809

Change-Id: I87143f17132186dea7575318d0a4c28c4f3e924c
 2020-07-13 02:32:34 +00:00
vichang
13121a763b Merge "Remove libcore.icu.ICU usage in android.text.format.DateFormat" am: ec71624f22 am: 3b25f55042 am: 8a202538bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355737

Change-Id: Ibf7d65359e2cc129fbf8e1366dfa80f23ae80c04
 2020-07-13 02:31:53 +00:00
Nathan Harold
697d925b09 [automerger skipped] Merge "Remove FIXME that getApnSetting should be NonNull" am: a0895c8580 am: a2f46553cf -s ours 
am skip reason: Change-Id Ifd80f2859e4a090225aab1b3a483325d654a2412 with SHA-1 4005f21d68 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1261865

Change-Id: I02dfc32f7f7df486f67e52e5cab3dfae6eb3cbf0
 2020-07-13 02:31:47 +00:00
vichang
8a202538bc Merge "Remove libcore.icu.ICU usage in android.text.format.DateFormat" am: ec71624f22 am: 3b25f55042 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355737

Change-Id: Ibc2b1561f316afe2371d9549190a0c328a180141
 2020-07-13 02:31:18 +00:00
Automerger Merge Worker
7dcf503836 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours am: e9fe9225e3 -s ours" into rvc-d1-dev-plus-aosp 2020-07-12 15:11:59 +00:00
TreeHugger Robot
d53928f20e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours am: e9fe9225e3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136585

Change-Id: I76f029c247abbfbcec910debcb92501c259fc987
 2020-07-12 15:11:49 +00:00
TreeHugger Robot
01438d20c0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours am: 981cdf9ed6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136585

Change-Id: I5ce8c2663c01ba9487af24366ea8af39836f94b2
 2020-07-12 15:11:32 +00:00
TreeHugger Robot
e9fe9225e3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136585

Change-Id: I12d3d8342548534019755745c62381519dbf0a02
 2020-07-12 14:55:17 +00:00
TreeHugger Robot
981cdf9ed6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136585

Change-Id: Ifde55f77c33ed659c3908b2e91b328bc6594b481
 2020-07-12 14:55:03 +00:00
TreeHugger Robot
c7901e9194 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ca8a77ea51 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12136594

Change-Id: Ia2f5b46fc20c6d06191550e044f0ee59e8ce7a2e
 2020-07-12 14:45:47 +00:00
TreeHugger Robot
77e3cce083 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-07-12 14:42:45 +00:00
TreeHugger Robot
ca8a77ea51 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-07-12 14:38:42 +00:00
Bill Yi
b6385c2957 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I125c8a02a199fb9e92eb429ec06779ee773c050d
 2020-07-12 02:30:40 -07:00
Bill Yi
2961f8694d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I6eb3096c4d809eff21e116828476857e1cb2b550
 2020-07-12 02:03:11 -07:00
Automerger Merge Worker
9ebc67e971 Merge "Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658b6 am: 40c895bcb2" into rvc-d1-dev-plus-aosp 2020-07-11 23:31:25 +00:00
Nikita Dubrovsky
a992633b26 Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658b6 am: 40c895bcb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099133

Change-Id: I2831c9bf46c06838a86bf9304962fae37535ff4f
 2020-07-11 23:31:14 +00:00
Nikita Dubrovsky
349e19d00c Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658b6 am: 59eed075de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099133

Change-Id: I603d505bee321a97b4d449c3789c63fe523c4814
 2020-07-11 23:31:08 +00:00
Nikita Dubrovsky
40c895bcb2 Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099133

Change-Id: Iee182d6e9c28ef8ad310d673bb2500752be61674
 2020-07-11 23:19:44 +00:00
Nikita Dubrovsky
59eed075de Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099133

Change-Id: I3a86a03b24ea84c2383af45b61d4e098f1f8b8ed
 2020-07-11 23:19:30 +00:00
Nikita Dubrovsky
e50d6658b6 Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev 2020-07-11 23:08:10 +00:00
TreeHugger Robot
df2ac3bfc7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7a33282392 -s ours am: 6ec12e6774 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12134821

Change-Id: Icb2f86e805924bb98758f6e4fce96daa72a24edf
 2020-07-11 19:21:28 +00:00
TreeHugger Robot
794dee40c1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7a33282392 -s ours am: 482997c563 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12134821

Change-Id: Iec78a53ebcb59c29decb323600f6fb781e478f10
 2020-07-11 19:21:18 +00:00
TreeHugger Robot
fb645b5932 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 596dca2fa0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12134725

Change-Id: I5c2827dd8e5df9feb71ddb8ffa2ddbf893f7e3b3
 2020-07-11 19:21:12 +00:00
TreeHugger Robot
482997c563 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7a33282392 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12134821

Change-Id: I38fbc7fd42f328534bb73cfd8cfcc84e98295596
 2020-07-11 19:11:41 +00:00
TreeHugger Robot
6ec12e6774 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7a33282392 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12134821

Change-Id: Iab8aba524f6c1a796f6aa83707bfcc2329804ce8
 2020-07-11 19:11:33 +00:00
TreeHugger Robot
596dca2fa0 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-07-11 19:09:29 +00:00