Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wilson Wu
89c98953c5 [RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference


Bug: 162536543
Change-Id: I0ac9c6b4414fe056c4dc06e5f9a14ad08c3cadcb
 2020-08-26 07:04:20 +00:00
Treehugger Robot
66bad21b87 [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: b74cd6eb18 am: 649667642c am: 5a4238cd78 -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 6afd939ba5 is in history

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

Change-Id: Iff9fe875b4e12d837e5fe52f956ff0f13d3c6ce3
 2020-08-25 21:09:22 +00:00
Treehugger Robot
5a4238cd78 Merge "Skip RAT type listener registration if IMSI is not available" am: b74cd6eb18 am: 649667642c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: I34de6bc6dd862f8042489f60f4b6be76af7c961e
 2020-08-25 20:49:04 +00:00
Treehugger Robot
649667642c Merge "Skip RAT type listener registration if IMSI is not available" am: b74cd6eb18 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: Ie24dee18456ee0741dbcd9330664398f0492c644
 2020-08-25 20:27:30 +00:00
Treehugger Robot
b74cd6eb18 Merge "Skip RAT type listener registration if IMSI is not available" 2020-08-25 19:55:09 +00:00
junyulai
781bce9c7f Skip RAT type listener registration if IMSI is not available 
Currently, if SIM is inserted but IMSI is not available, such
as SIM PIN locked state. Information of such SIM will still
be available but IMSI is not. Which makes
NetworkStatsSubscriptionMonitor failed to store IMSI locally
for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is
always returned for such SIM.

Skip the registration until the IMSI is available. This is safe
since there will be another onSubscriptionsChanged event when
that happens.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Merged-In: I408379b3c432d9e62e0837d6b4f6551cc7838e29
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
(cherry-picked from ag/12400327)
 2020-08-25 18:03:38 +08:00
Yo Chiang
55668c1a49 Check error status after installing each DSU partition 
Add DynamicSystemManager.closePartition() that closes a partition
installation and returns its error status.
InstallationAsyncTask may call this method to do error checking.

Bug: 165471299
Test: Observe the logcat of a failed DSU installation
Change-Id: I9d155c70c6e490899a4acfd35c8096549af005d4
 2020-08-25 07:48:16 +00:00
Treehugger Robot
944a9486df Merge "Prefer = delete in place of DISALLOW_COPY_AND_ASSIGN." am: 73c4e18d80 am: f288999050 am: e86ab75f4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1407407

Change-Id: I6146b9898b091a7ba11621f64deeee328ff2bb84
 2020-08-24 21:21:48 +00:00
Treehugger Robot
e86ab75f4e Merge "Prefer = delete in place of DISALLOW_COPY_AND_ASSIGN." am: 73c4e18d80 am: f288999050 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1407407

Change-Id: Ia3706d2810ebff030d077b91471fd260e16d1025
 2020-08-24 20:03:04 +00:00
Treehugger Robot
f288999050 Merge "Prefer = delete in place of DISALLOW_COPY_AND_ASSIGN." am: 73c4e18d80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1407407

Change-Id: I48ee420aec46658f3e2863a5d2f6b53c0caa7d12
 2020-08-24 19:34:08 +00:00
Treehugger Robot
73c4e18d80 Merge "Prefer = delete in place of DISALLOW_COPY_AND_ASSIGN." 2020-08-24 17:50:52 +00:00
TreeHugger Robot
b846f204a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7ba2423687 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I164338e009d74e440272d28c9c979718b4bc5446
 2020-08-24 17:30:56 +00:00
TreeHugger Robot
7ba2423687 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-24 16:43:27 +00:00
Oliver Nguyen
52cb714145 Merge "Disable Java coverage for multidex tests." am: 11ce7bf502 am: f7ba6a3c5f am: fc3de7e3df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406250

Change-Id: I7c2c0d78e0624b7a6c749c6860ed567b97aa748a
 2020-08-24 11:53:53 +00:00
Siyamed Sinir
0e72570b88 Merge "Remove clarabayarri from text OWNERS" am: 3fe6523d2f am: 153ae28af7 am: c7790b29ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406974

Change-Id: I042469b4aef280d955fc8199751b352fceb00a65
 2020-08-24 11:53:41 +00:00
Louis Pullen-Freilich
d839a65584 Merge "Adds lpf@ to preference owners" am: 0c66523a48 am: 8a42ceda65 am: 0c311b4d8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406973

Change-Id: Ic51084fd57a97d4e065a49434a9357d73ec56db7
 2020-08-24 11:53:30 +00:00
Treehugger Robot
618057b537 [automerger skipped] Merge "Add systrace tag for system property" am: bd04e45980 am: e8586725cd -s ours am: 2376215d0d -s ours 
am skip reason: Change-Id Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is in history

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

Change-Id: Ifabe67dd9b38452f9c97937a1117eff82e939330
 2020-08-24 11:53:10 +00:00
Jason Hsu
a50e74fc84 [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 267cc11642 am: 711a4b4b2d -s ours am: 8ce269efa4 -s ours 
am skip reason: Change-Id I915e09e4e64d5c268630cec2d0ef05ea0592fd6f with SHA-1 bde40af6ca is in history

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

Change-Id: I06cf44ce9b88a376d7d23d8e9f0be4c19d3aba92
 2020-08-24 11:52:46 +00:00
Treehugger Robot
a017206faa Merge "Adding TEST_MAPPING to frameworks/base/keystore" am: 5dd8206c04 am: 844ceb6d89 am: d3bcb99fee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1405551

Change-Id: Ifa0d06af6c9ef1a55f58fd9196a7275f9e33dd41
 2020-08-24 11:52:33 +00:00
Treehugger Robot
4d7fefcd6e Merge "Switch to callback animation" am: 51060f3f7a am: 5267d92272 am: 42e412b511 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399752

Change-Id: I01b9ffcba348f66aca9b751926575e53587478a4
 2020-08-24 11:52:21 +00:00
Orion Hodson
08e54a12ec resolve merge conflicts of 525ed1c275 to rvc-dev-plus-aosp am: be053b7e19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12432135

Change-Id: I3d89978f6475bd83f0e4c26d37be603bde1987ce
 2020-08-24 11:51:56 +00:00
Oliver Nguyen
fc3de7e3df Merge "Disable Java coverage for multidex tests." am: 11ce7bf502 am: f7ba6a3c5f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406250

Change-Id: Ie0fac1e3f7302bc5e14876c8439097c22d498e1f
 2020-08-24 11:31:09 +00:00
Siyamed Sinir
c7790b29ad Merge "Remove clarabayarri from text OWNERS" am: 3fe6523d2f am: 153ae28af7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406974

Change-Id: I36b8f7edad6cd11e54c89c8adcc43177710d8fac
 2020-08-24 11:30:56 +00:00
Louis Pullen-Freilich
0c311b4d8a Merge "Adds lpf@ to preference owners" am: 0c66523a48 am: 8a42ceda65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406973

Change-Id: I496eeb2ed6dc00f07bc4948af56fcfa339cf21dc
 2020-08-24 11:30:34 +00:00
Treehugger Robot
2376215d0d [automerger skipped] Merge "Add systrace tag for system property" am: bd04e45980 am: e8586725cd -s ours 
am skip reason: Change-Id Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is in history

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

Change-Id: Ic3ee7a770031ab343b0fa959605260a76df16506
 2020-08-24 11:29:49 +00:00
Jason Hsu
8ce269efa4 [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 267cc11642 am: 711a4b4b2d -s ours 
am skip reason: Change-Id I499c4574464862f3a1dcea2c6d51813e23ba4b82 with SHA-1 8ea64c4b6a is in history

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

Change-Id: I865cede45f15bb2339e7cf3341caceff2991b8b4
 2020-08-24 11:29:22 +00:00
Treehugger Robot
d3bcb99fee Merge "Adding TEST_MAPPING to frameworks/base/keystore" am: 5dd8206c04 am: 844ceb6d89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1405551

Change-Id: I1e012c2ba0f3e9f41b44f009d9aea5cbf5e8fe9c
 2020-08-24 11:29:04 +00:00
Treehugger Robot
42e412b511 Merge "Switch to callback animation" am: 51060f3f7a am: 5267d92272 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399752

Change-Id: I3e4d82a9a2f9e9f4f1232a2de21a55cc19a2168a
 2020-08-24 11:28:48 +00:00
Bill Yi
151afab95b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I62484ed4cc2cc5cad6fbffb4bb30c559cc7283a7
 2020-08-24 03:32:36 -07:00
Orion Hodson
be053b7e19 resolve merge conflicts of 525ed1c275 to rvc-dev-plus-aosp 
Change-Id: Icc691f4d16c5e689b30885fe6e99dc827310fa98
 2020-08-24 09:07:41 +00:00
TreeHugger Robot
c570c6aec7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 8e2d3a4c0a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I736c9733a23e6384ba9c0165319298d9832d4234
 2020-08-23 15:05:05 +00:00
TreeHugger Robot
819769a170 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 3481b309ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9e12dfc85f3dedfbc543efbc90addf01f21b04d
 2020-08-23 15:04:35 +00:00
TreeHugger Robot
8e2d3a4c0a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-23 14:47:46 +00:00
TreeHugger Robot
3481b309ec Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-23 14:26:16 +00:00
TreeHugger Robot
5720a7b228 Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: Ia10dc546e107e9c1fc249766c2bcfc5856ce1bd2
 2020-08-23 13:18:49 +00:00
TreeHugger Robot
5403c7646a Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev 2020-08-23 13:06:10 +00:00
Bill Yi
6b0ae2ef20 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idf33aff085527105b79a56cb41faea2d4905a7fb
 2020-08-23 04:31:03 -07:00
Bill Yi
dcb29f69d9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5dfec64eb354ddd9a7dd16510162152490fa6d22
 2020-08-23 02:42:32 -07:00
Stephen Hines
39fa5efb15 Prefer = delete in place of DISALLOW_COPY_AND_ASSIGN. 
Clang-tidy expects modernized code to prefer deleting copy constructors
and assignment operators to legacy macros.

/disk/android_trees/aosp-master-plus-llvm/frameworks/base/cmds/idmap2/tests/ResultTests.cpp:263:3: error: prefer deleting copy constructor and assignment operator over using macro 'DISALLOW_COPY_AND_ASSIGN' [modernize-replace-disal low-copy-and-assign-macro,-warnings-as-errors]
  DISALLOW_COPY_AND_ASSIGN(NoCopyContainer);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Bug: http://b/155835175
Test: mm in idmap2
Change-Id: I3bb29b48a478a67cbda959f47b271ccf8543a768
 2020-08-22 10:08:56 -07:00
TreeHugger Robot
d274706b8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 30166a7e23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I970b0fff2f07db9dab01627be1181b9c6cc4a370
 2020-08-22 14:52:51 +00:00
TreeHugger Robot
03439aaef7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 0468f27105 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9326ae5005364f267d08652a6ad8e31f0f2a5597
 2020-08-22 14:52:34 +00:00
Bill Yi
3ed2fbad73 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cbc5741db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b0b51c6e64d957eb90e9f51fcc4e8484f1271cc
 2020-08-22 14:52:09 +00:00
TreeHugger Robot
30166a7e23 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-22 14:48:47 +00:00
TreeHugger Robot
0468f27105 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-22 14:45:07 +00:00
Bill Yi
1cbc5741db Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5756e3fc671d313c6c853fcfd8d44617ecadfb1a
 2020-08-22 04:02:18 -07:00
Bill Yi
9fd9023250 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I689c1afe36244a8493c913d87fdef58f48265a8b
 2020-08-22 02:33:24 -07:00
Bill Yi
0a260fa746 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3ec355b2c117c385f6696e9c6f382d717e0ff27b
 2020-08-22 08:14:36 +00:00
TreeHugger Robot
e8faa17604 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fc30db1bd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01dbb94e5e7959f3d9b4d20b15700d6df369d7ea
 2020-08-21 22:31:58 +00:00
TreeHugger Robot
dda4f26a2d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 68755307c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I662e1b81fd31372a6ec3ab94fb0a929812cd61a0
 2020-08-21 22:31:37 +00:00
TreeHugger Robot
429ae48fc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d379a76ad4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I630d0462a732616587f9727e036f031bd08b9df5
 2020-08-21 22:31:01 +00:00