Commit Graph

1165 Commits

Author SHA1 Message Date
Paul Hu
5bc47bf309 Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de am: caf808e0eb am: 3793a8eece am: ac1ddcf34a
Change-Id: I1d6aedfb2008a4af9a1cb7eb392050774204fcae
2020-04-14 10:07:54 +00:00
Mark Chien
b3dcb3df1f [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours am: 1cfb5e6365 am: db0698b0a0 am: c78a72d80c
Change-Id: I0ef964128dd034af024e589bf898ef325cda03ce
2020-04-14 10:07:25 +00:00
Paul Hu
ac1ddcf34a Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de am: caf808e0eb am: 3793a8eece
Change-Id: I85bba02377351bdf19562b27a645a142356371ca
2020-04-14 09:45:57 +00:00
Mark Chien
c78a72d80c [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours am: 1cfb5e6365 am: db0698b0a0
Change-Id: I573b350831f620a4a570c402f99e0943c735d35a
2020-04-14 09:45:42 +00:00
Paul Hu
3793a8eece Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de am: caf808e0eb
Change-Id: I0a4801884b455aa1e6186afcc41f73f34caa9474
2020-04-14 09:22:46 +00:00
Mark Chien
db0698b0a0 [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours am: 1cfb5e6365
Change-Id: I9f5ea3568621f7350bb8d3314a4b8dc0ee5bdc67
2020-04-14 09:22:07 +00:00
Paul Hu
caf808e0eb Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de
Change-Id: If9d8e5945160b6def527e7f3ee372dfe533140e9
2020-04-14 09:20:54 +00:00
Mark Chien
1cfb5e6365 [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours
am skip reason: skipped by user markchien

Change-Id: I23b0ffb1f366f980bc7c9c3b4c061214b8199307
2020-04-14 09:19:38 +00:00
Paul Hu
26b3b4e0de Merge "Update tethering notification strings" am: 6f6527e2d7
Change-Id: I1af1b1a8664662ebdffba1b08725b4e505c222f4
2020-04-14 07:32:32 +00:00
Paul Hu
6f6527e2d7 Merge "Update tethering notification strings" 2020-04-14 07:15:16 +00:00
Mark Chien
9fce5bc8b9 Merge "Change tethering file structure to respect its package name" am: c31e88ace6
Change-Id: Ib7db789690b64ca00905577ee9ed7ed993293967
2020-04-14 04:50:53 +00:00
Mark Chien
e4d18addd3 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours am: dd81ce4743 -s ours am: 4dd1e7dfaf -s ours am: f03d622633 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Ide1ce0e29ec85bb0c7c7260b2cc4fd491d0f04d0
2020-04-14 03:27:10 +00:00
Mark Chien
f03d622633 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours am: dd81ce4743 -s ours am: 4dd1e7dfaf -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Ia0863cd191c11d1ada99af1ddbc8ea989232bed5
2020-04-14 03:04:19 +00:00
Mark Chien
4dd1e7dfaf [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours am: dd81ce4743 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: I677fbecc79dcfe3ba8bc5265e02288e4f2856a61
2020-04-14 02:42:52 +00:00
Mark Chien
3bf1ce0aec [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: 4c1bfe97e9 am: 787ed2c4b2 -s ours am: 3bc84ebb9a -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Ifbc6b6f856e1dd905f883f3ca0c5cb7d9ed9d599
2020-04-14 02:37:01 +00:00
Mark Chien
27312f6417 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 313841e5eb am: 34000f3b25 -s ours am: 526b96e312 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Iefdfddd941e47b435451c57d9d4b7413171a8940
2020-04-14 02:35:40 +00:00
Mark Chien
26aab8b17c [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: fb4fc50afd am: d22d5de8f6 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 dc03d15189 is in history

Change-Id: I319b1ce795e2b731c621559bcb8d57f77199e485
2020-04-14 02:35:28 +00:00
Mark Chien
3bc84ebb9a [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: 4c1bfe97e9 am: 787ed2c4b2 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: I009351412aca7e385dc29aeb327af79542d2098e
2020-04-14 02:32:47 +00:00
Mark Chien
dd81ce4743 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9 am: d5b1f4c10f -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: Idfc7a32b608c97c9ebc956b6d4bf85a5d8f42776
2020-04-14 02:19:35 +00:00
Mark Chien
526b96e312 [automerger skipped] Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 313841e5eb am: 34000f3b25 -s ours
am skip reason: Change-Id I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e with SHA-1 af37b0a723 is in history

Change-Id: I64be42bd1e866248fd7b684a24d309d01030252d
2020-04-14 02:14:13 +00:00
Mark Chien
d22d5de8f6 Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: fb4fc50afd
Change-Id: I5ec9ab1546d54eac5567ade0ba0a10ad36199f25
2020-04-14 02:14:04 +00:00
Mark Chien
787ed2c4b2 Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce am: 4c1bfe97e9
Change-Id: If2a83e19b3074af14a8433a98e73d539bd211dab
2020-04-14 02:11:12 +00:00
markchien
d995566700 Change tethering file structure to respect its package name
Bug: 145099347
Test: atest TetheringTests
      atest CtsTetheringTest
Change-Id: I7401c550fbafd17a5ed2d925b5d0e17e358af467
2020-04-14 02:09:51 +00:00
Mark Chien
d5b1f4c10f Merge "Tethering: Add an exported flag in manifest" am: ec6cf543f9
Change-Id: I10166943f9c84abc71e34807fd6960c4fa23fed5
2020-04-14 01:58:11 +00:00
Mark Chien
34000f3b25 Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 313841e5eb
Change-Id: I237d190874d4a30d40df15a64880a6fbaab7a015
2020-04-14 01:51:51 +00:00
Mark Chien
fb4fc50afd Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c am: 711b2becce
Change-Id: I7592bff18c405a0526ed3c4146d7f6eff9d9e99e
2020-04-14 01:51:43 +00:00
Mark Chien
313841e5eb Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c
Change-Id: Icc13f39dc779d7432d95c07aedbcf1bc5d756078
2020-04-14 01:50:18 +00:00
Mark Chien
711b2becce Merge "Tethering: Add an exported flag in manifest" into rvc-dev am: ddbe63e44c
Change-Id: I8ab438ea40b26f2de880e8dbd38adc7bcbd76306
2020-04-14 01:47:58 +00:00
TreeHugger Robot
daf1836e92 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: f90dce2195 -s ours am: 5fdbc69718 -s ours
am skip reason: subject contains skip directive

Change-Id: Id26b79f3095116fa83baf0ea0c51b6b2b1a51be7
2020-04-14 00:44:08 +00:00
TreeHugger Robot
5fdbc69718 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: f90dce2195 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9c15809ee09fff7126cf044dc5cd26e8caa69b3
2020-04-14 00:30:15 +00:00
Bill Yi
4e7d4a611e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I562307bd38d87a0ccd16db99a41d3101f3f37670
2020-04-13 10:43:20 -07:00
Ashwini Oruganti
910a0b44dd Tethering: Add an exported flag in manifest
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

Bug: 150232615
Test: TH
Change-Id: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
Merged-In: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
(cherry picked from commit dc03d15189)
2020-04-14 00:08:24 +08:00
Ashwini Oruganti
af37b0a723 Tethering: Add an exported flag in manifest
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

Bug: 150232615
Test: TH
Change-Id: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
Merged-In: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
(cherry picked from commit 9226d6c835cd57d10a7562f18143dbaae8601b43)
2020-04-13 15:15:28 +00:00
paulhu
735047bf6e Update tethering notification strings
Update strings after converged with carrier.

Bug: 145629001
Bug: 147818698
Test: atests TetheringTests
Change-Id: I8ad34e8c93ba1547aa397a8e9c0ecc15286a2b0b
2020-04-13 13:36:52 +00:00
Mark Chien
94bd04280a [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 am: ab9477a850 am: c1217cef03 -s ours am: eb42360f22 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I3180d4d4a2e78784dabececec066521ab73f6870
2020-04-10 14:52:41 +00:00
Mark Chien
eb42360f22 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 am: ab9477a850 am: c1217cef03 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I2b9c026028b40d65aafa074d6f3e73f2f468ec28
2020-04-10 14:45:43 +00:00
Mark Chien
0c283e2cfe [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours am: e600d2685b -s ours am: addf2cbafc -s ours am: 0633ca4c97 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I379f15d8421cadbb9a43794218a3f0fae2436e7d
2020-04-10 14:44:12 +00:00
Mark Chien
74d9f0a466 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 -s ours am: 70538b88c3 -s ours am: 2bfabf7e46 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

Change-Id: I1b6d1efda8f014d872844ce0b6b9d50d32512f19
2020-04-10 14:43:35 +00:00
Mark Chien
0633ca4c97 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours am: e600d2685b -s ours am: addf2cbafc -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I0561f552a9b890995b8d5c987512292a9e7a1f75
2020-04-10 14:26:03 +00:00
Mark Chien
c1217cef03 Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 am: ab9477a850
Change-Id: I7d06af795731d41748729b2edcf41f2fd30cf770
2020-04-10 14:25:16 +00:00
Mark Chien
2bfabf7e46 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 -s ours am: 70538b88c3 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

Change-Id: I687b35097132f4113a661be8cb80cefe2e637df7
2020-04-10 14:24:55 +00:00
Mark Chien
addf2cbafc [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours am: e600d2685b -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I8f64dc247f35087304e80763c1dc61f38d0870ea
2020-04-10 14:07:03 +00:00
Mark Chien
70538b88c3 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

Change-Id: Ib21123448c33b7842288b0e0b2ec356502884b80
2020-04-10 14:05:43 +00:00
Mark Chien
e600d2685b [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

Change-Id: I66e4ecbfff6afc191a053a4c8c4d3603af41d519
2020-04-10 13:46:38 +00:00
Mark Chien
a00a4e12e1 Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8
Change-Id: I0cd72deb1c8cf12507321e704547df00cf328ce1
2020-04-10 13:46:32 +00:00
Treehugger Robot
5da1070d8f Assign specific client address to dhcp server
Bug: 141256482
Test: manual
      atest TetheringTests

Merged-In: Ief76c98c843ba5420224cbf0f34464f366c891b7
Change-Id: Ief76c98c843ba5420224cbf0f34464f366c891b7
2020-04-10 10:03:20 +00:00
Luke Huang
3f7127a1a4 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 am: bf96df2a61 am: 16fba9fa1a -s ours am: d0f9a794db -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 d20078112b is in history

Change-Id: I24fdc9a774f89463452304ca21a1991d4354242a
2020-04-10 09:44:23 +00:00
Luke Huang
d0f9a794db [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 am: bf96df2a61 am: 16fba9fa1a -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 d20078112b is in history

Change-Id: I87110d8f782b486af1beeada080d14f4fab172a1
2020-04-10 09:33:38 +00:00
Luke Huang
16fba9fa1a Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 am: bf96df2a61
Change-Id: Ib2869d21e371f6c0b3204cda950748f615610060
2020-04-10 09:14:43 +00:00
Luke Huang
aafd4bf278 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 -s ours am: c043fcc7be -s ours am: 879f659782 -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 d20078112b is in history

Change-Id: I42e8aaeb448cb9fe590b081e07a93ab3439207b1
2020-04-10 09:14:38 +00:00