Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
147,798 Commits 1 Branch 0 Tags
e62ac1ecd3ae0e3c91bd024fb70dc21b47f0ef8c
Commit Graph

147798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
e62ac1ecd3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

BUG: 236134775,236134583
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:79ef6210b09cff3c9a15b56a07c3bc0b1241f0e0
Merged-In: Ibe220851e7ca9f3a5362ba0f6dc1b41820d5815a
Change-Id: Ibe220851e7ca9f3a5362ba0f6dc1b41820d5815a
 2025-10-10 14:23:35 -07:00
Haijie Hong
8ec6581ae7 Backport BT pairing dialog changes 
This is a combination of two commits against b/409868905, merged for
backport convenience.  It updates the string and button style for the BT
pairing dialog.

Bug: 236134583
Bug: 236134775
Test: local tested
Flag: EXEMPT minor style update
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:22378fd5a1bb2ca8d63f5df4e47c0af218c66a57
Merged-In: Icd9f509b5363b3ec3900738e21486e54d4e66e4b
Change-Id: Icd9f509b5363b3ec3900738e21486e54d4e66e4b
 2025-10-10 14:23:05 -07:00
James Eidson
aa744e8988 [nfc] Fix string injection in default payment app selector 
Backwards compatible port of ag/35084316

Bug: 429417453
Test: Manually by installing settings app
Flag: EXEMPT security fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6c723a4361950e8e43cc5caf67455bd2f00911d1)
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:b04265c1b84104884654d4957c5fb3a8ac84bc00
Merged-In: I670774a5efa6f543a5e1e06798a5d6ebb1c48c1d
Change-Id: I670774a5efa6f543a5e1e06798a5d6ebb1c48c1d
 2025-10-10 14:22:38 -07:00
Joe Bolinger
83447688f8 Add check to prevent privilege escalation from trampoline added in change Ie469c47005afb941f5646a2f790736362c23c697. 
Add additional check in enrollment base class.

Flag: EXEMPT CVE_FIX
Bug: 418774489
Test: atest FaceEnrollTest FaceEnrollIntroductionTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c07d03e5ef9ff05f34b6358440af6770044579ae)
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:e0476f87117c1b689b96c9a37ac12162d79c6cf6
Merged-In: I49f4a980a0c9ed80cc2e370a42bd60425d018a4c
Change-Id: I49f4a980a0c9ed80cc2e370a42bd60425d018a4c
 2025-10-10 14:22:09 -07:00
Julia Reynolds
596c7b9911 Hide sensistive content from locked profiles 
Test: manual
Flag: EXEMPT bug fix
Bug: 396666065
(cherry picked from commit b1bfda5a03c6d21a16da0de2eb77340536400ca6)
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:0c2075c139445d83491ee9ad9991e55e7b32ff6b
Merged-In: Ie7705a1ceea54203585c3b3737d0bada68aa1469
Change-Id: Ie7705a1ceea54203585c3b3737d0bada68aa1469
 2025-10-10 14:21:41 -07:00
Mill Chen
586f8dedd8 Prevent SettingsSliceProvider from accessing unused packages 
DISABLE_TOPIC_PROTECTOR

Bug: 388034510
Test: adb shell cmd slice get-permissions com.android.settings.slices
      atest SettingsSliceProviderTest
Flag: EXEMPT security issue
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:fc32bd01fa26a116c4217fec157be43f01633add
Merged-In: Ia655fbb9cb46f192559b82f957e3b2f0dd86946c
Change-Id: Ia655fbb9cb46f192559b82f957e3b2f0dd86946c
 2025-10-10 14:21:13 -07:00
Android Build Coastguard Worker
a88303033f Merge cherrypicks of ['googleplex-android-review.googlesource.com/33629809', 'googleplex-android-review.googlesource.com/33629810', 'googleplex-android-review.googlesource.com/33646576', 'googleplex-android-review.googlesource.com/33607203', 'googleplex-android-review.googlesource.com/33909851', 'googleplex-android-review.googlesource.com/33751637', 'googleplex-android-review.googlesource.com/33923313', 'googleplex-android-review.googlesource.com/34044915'] into 25Q2-release. 
Change-Id: I5f332baa008006699a4c3386d544e38d68db3a31
 2025-08-12 18:52:22 -07:00
Joe Bolinger
2aa27461a4 Ignore face settings extras when called by an external package. 
Bug: 411418366
Flag: EXEMPT bug fix
Test: manual from any user not 0 (adb shell am start -a android.settings.FACE_SETTINGS --ei android.intent.extra.USER_ID 0)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:486947205e05e83314bd76e4822af442ca82be9c)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0baf462586f1bc99a120e005c5d273bd8cfa01e9)
Merged-In: I06193e421a140a90568251fc25baa7fc81c12d78
Change-Id: I06193e421a140a90568251fc25baa7fc81c12d78
 2025-08-12 18:50:40 -07:00
Adam Bookatz
25ed933c4c startActivityForResult with earlier new Intent 
We already make sure to use a copy of the Intent, but now we do so
earlier. See bug.

Bug: 353680402
Flag: EXEMPT bugfix
Test: manual
Test: atest com.android.settings.users.UserSettingsTest
            com.android.settings.users.UserDetailsSettingsTest
(cherry picked from commit b7240e2f0c50455a1c8f3ae1fc4f27d55b86e89b)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d8166274a030372f9b1184137fceef9d4dac83e1)
Merged-In: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179
Change-Id: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179
 2025-08-12 18:50:32 -07:00
Julia Reynolds
504a34c4d4 Hide notification content in history 
- if the user is locked
- and the user has chosen to hide sensistive content when locked

Test: manual with a work profile with a different pin
Bug: 378088320
Flag: EXEMPT bug fix
(cherry picked from commit 9df37c3f8be2dedd2e44e52da4de45fba33c6a6e)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ac4d72060aeb282d5c1c024438ed9e0689b50031)
Merged-In: Ia70454d9859fb788ffa1f48f88760f88c354cdff
Change-Id: Ia70454d9859fb788ffa1f48f88760f88c354cdff
 2025-08-12 18:50:25 -07:00
Rubin Xu
0f61e58687 Use correct API to get calling package name in CredentialStorage 
Activity.getCallingPackage() does not always return the package
name of the actual calling app. getLaunchedFromPackage() should
be used instead.

Bug: 389681530
Test: manual
Flag: EXEMPT bugfix
(cherry picked from commit 70bd3efe0674bccb0d454845d86fb2402779a7bf)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48e4b5e1af2156dc0db1546df1c14030e77e542e)
Merged-In: Ibdbc45e53f4aa46fae79fa234705b3735bfda4cd
Change-Id: Ibdbc45e53f4aa46fae79fa234705b3735bfda4cd
 2025-08-12 18:50:18 -07:00
Joe Bolinger
d50de07930 Drop PendingIntent extras from external packages during enrollment. 
Bug: 388528350
Flag: EXEMPT bugfix
Test: atest FingerprintEnrollIntroductionTest FaceEnrollIntroductionTest
(cherry picked from commit 4ccdeee849d5fef78498ba33cadc525523efcbd7)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9dd5ed1cea0449812775fb76a46f8be2e6862425)
Merged-In: I61281dcf95e53100a96d6a218f3f00fd1b4ea3f9
Change-Id: I61281dcf95e53100a96d6a218f3f00fd1b4ea3f9
 2025-08-12 18:50:11 -07:00
Adam Bookatz
dc41d27f1b Do not enable the Content Protection toggle for non-admin users. 
Flag: EXEMPT bugfix
Bug: 409318132
Test: m -j256 Settings && atest
SettingsRoboTests:ContentProtectionTogglePreferenceControllerTest
(cherry picked from commit ef801e1a8ec3a18ce9e0221fc7e1dfe495d0be8a)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:094c9df207d9bb430427dadc2e327b4834b57b01)
Merged-In: I46609c795923d427a5b7fa10bc2e8b071fad72d6
Change-Id: I46609c795923d427a5b7fa10bc2e8b071fad72d6
 2025-08-12 18:50:04 -07:00
Aseem Kumar
e985e294f1 Add ComponentName explicitly to make sure arbitary intents aren't launched from Settings. 
Bug: 378902342
Flag: EXEMPT security fix
(cherry picked from commit 6a896b6b26d445800773e1b4649895bea17eac1f)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ade7c77634363b787e8e73591247d9dff2b1b149)
Merged-In: I0e67f1258cb427c5b998e40a8a0c104af3ead042
Change-Id: I0e67f1258cb427c5b998e40a8a0c104af3ead042
 2025-08-12 18:49:54 -07:00
Adam Bookatz
e12156e2d8 AppRestrictions - use vetted component 
After vetting the intent, use the component we used for the vetting.

Bug: 353680402
Bug: 365739560
Test: manual
Flag: EXEMPT bugfix
(cherry picked from commit d3e34060803c97ae05719fe9301026e5c54892c8)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:586422578de58f1da68fd9becf89a08ea2ae0058)
Merged-In: Iff0d820c1261c29eb6703bf89194339cba700688
Change-Id: Iff0d820c1261c29eb6703bf89194339cba700688
 2025-08-12 18:49:45 -07:00
Android Build Coastguard Worker
cf4c8c7049 Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010532'] into 25Q2-release. 
Change-Id: I17b7fe4e4196befdd6df7ef7de0a774032f04602
 2025-05-16 09:18:57 -07:00
Jay Wang
9fca47cbc1 Add battery health tip 
Bug: 406894719
Test: local test
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b49d170117c6918efe56a883add4816c279fd2a9)
Merged-In: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
Change-Id: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
 2025-05-16 09:17:07 -07:00
Android Build Coastguard Worker
0fb38ed81e Merge cherrypicks of ['googleplex-android-review.googlesource.com/32799199'] into 25Q2-release. 
Change-Id: I53c81f56907c0b68bdb4376b1cede8abc75ebadc
 2025-04-25 14:23:28 -07:00
Vadym Omelnytskyi
a2d3155609 Revert "Screen Resolution: add space for 4-digit values" 
This reverts commit 14050c89f5.

Reason for revert: b/406416297
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:626993cd66a1e2b75cc40445373d22503f73f19e)
Merged-In: Ib683398cf3c3753d2874e4f108c0bb09a9635ab5
Change-Id: Ib683398cf3c3753d2874e4f108c0bb09a9635ab5
 2025-04-25 14:06:57 -07:00
Android Build Coastguard Worker
e1c2d09e01 [coastguard skipped] Merge sparse cherrypicks from sparse-13392877-L45400030011494577 into 25Q2-release. 
COASTGUARD_SKIP: I37f1895c1092f45f91089c36b3b4409dde3e691c
COASTGUARD_SKIP: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc

Change-Id: I5a50b50be0a87b01a1d93b40ee1f3d20e80c6a08
 2025-04-23 13:45:11 -07:00
Android Build Coastguard Worker
b4a412b3d5 Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010532'] into sparse-13392877-L45400030011494577. 
SPARSE_CHANGE: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc

Change-Id: I37f1895c1092f45f91089c36b3b4409dde3e691c
 2025-04-23 13:40:47 -07:00
Jay Wang
024836686b Add battery health tip 
Bug: 406894719
Test: local test
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b49d170117c6918efe56a883add4816c279fd2a9)
Merged-In: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
Change-Id: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
 2025-04-23 13:38:11 -07:00
Android Build Coastguard Worker
12ea1a89e5 Merge cherrypicks of ['googleplex-android-review.googlesource.com/33140168'] into 25Q2-release. 
Change-Id: I667898a56b609288d7778cec0dc8351889e10560
 2025-04-21 19:29:02 -07:00
tom hsu
edcb16bde3 Improve potential NPE problem 
- Move CarrierConfigCache initialization to make sure the instance
   created.

Flag: EXEMPT bug fix
Fix: b/409841639
Test: atest pass
(cherry picked from commit 00ab92f97f2c04ca9f604f282542ffd9680f27fc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c2c6745859027b54628bea81a153856e2d8c753)
Merged-In: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed
Change-Id: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed
 2025-04-21 19:27:43 -07:00
Android Build Coastguard Worker
08e0488ee2 Merge cherrypicks of ['googleplex-android-review.googlesource.com/32950184', 'googleplex-android-review.googlesource.com/32952319', 'googleplex-android-review.googlesource.com/33000561'] into 25Q2-release. 
Change-Id: I2b7939e1a11a9ba5856365582e6f2826c62bb8b8
 2025-04-12 12:47:05 -07:00
Bill Yi
d27d4d0a87 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

Bug: 408276020
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1fd9d49502f3022819250d4f7b071105a487afb8)
Merged-In: I8cb5cfdb20be049154127cb51d8f9c2d449efaa1
Change-Id: I8cb5cfdb20be049154127cb51d8f9c2d449efaa1
 2025-04-12 12:33:38 -07:00
Bill Yi
d2a3eb3a91 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

Bug: 408276020
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fb6e003c12031ec5a006e9823027127dca586386)
Merged-In: I9936898bcefdabe144efb3368d7eebe9c7a44f6a
Change-Id: I9936898bcefdabe144efb3368d7eebe9c7a44f6a
 2025-04-12 12:33:26 -07:00
Bill Yi
e3192b4216 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

Bug: 408276020
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bf65f030c604c1e37979de8f5879d59d94c8b35)
Merged-In: Idb362ec0402a802fffc104243ed0bafe3bd50df7
Change-Id: Idb362ec0402a802fffc104243ed0bafe3bd50df7
 2025-04-12 12:33:10 -07:00
Android Build Coastguard Worker
bbb340f8ea Merge cherrypicks of ['googleplex-android-review.googlesource.com/32887373'] into 25Q2-release. 
Change-Id: Ia413b76ff8767e69f8a757e39d65c5aeb709b2c7
 2025-04-07 20:05:00 -07:00
Florian Mayer
92e1b25a29 Fix crash if device policy disables MTE 
Flag: EXEMPT bugfix
Test: set device policy using TestDPC, observe crash is gone
Bug: 407990172
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec6b4842bef8f6f29989bb370d44499a70d6172e)
Merged-In: Ib5f01cb5bb3296ee0b5909a1a730e9dad040902b
Change-Id: Ib5f01cb5bb3296ee0b5909a1a730e9dad040902b
 2025-04-07 20:00:34 -07:00
Android Build Coastguard Worker
294b12a39b Merge cherrypicks of ['googleplex-android-review.googlesource.com/32835485', 'googleplex-android-review.googlesource.com/32836107', 'googleplex-android-review.googlesource.com/32836113'] into 25Q2-release. 
Change-Id: I8c3ca8cef3574248052d0cf5a25211a2afc5767b
 2025-04-02 19:49:13 -07:00
Bill Yi
8aee29c53e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

Bug: 406841318
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:439726a415d603de90517871de285661018db5d3)
Merged-In: I808ce1ffe3b38350d50e049cdfb5bedd2812e1f5
Change-Id: I808ce1ffe3b38350d50e049cdfb5bedd2812e1f5
 2025-04-02 19:38:21 -07:00
Bill Yi
07e7d29473 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

Bug: 406841318
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a273b927dd2b7be164abb1145ca00e8b92bc5e41)
Merged-In: I8f4075e67060fcb7220d230b9a8e6e5063877edd
Change-Id: I8f4075e67060fcb7220d230b9a8e6e5063877edd
 2025-04-02 19:38:04 -07:00
Bill Yi
9165802054 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import

Bug: 406841318
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce58acd615ac53dc476a87c9e4ed1f9441c2c4aa)
Merged-In: I5fdbe6b236274b7a005f8378a6bedd2f7f750897
Change-Id: I5fdbe6b236274b7a005f8378a6bedd2f7f750897
 2025-04-02 19:37:46 -07:00
Android Build Coastguard Worker
2b76145529 Merge cherrypicks of ['googleplex-android-review.googlesource.com/32649929'] into 25Q2-release. 
Change-Id: I9335e3e4e9d90c255d17b9a8bdd7d46e87189bf8
 2025-04-01 20:54:39 -07:00
Steve Statia
1127cfb00f Fix hidden menu not showing phone information 100% of the time when opening. 
The function that sends the special code is sending intents to all
users, which is creating an activity for both the work profile and the
system user. Whichever intent is received last will be the activity on
top and displayed to the user, and since the work profile's hidden menu does not include the 'Phone
information' option it creates this 'randomness' observed with opening the menu.

This change ag/29101523 started sending the broadcast as UserHandle.ALL, instead of just from the current user causing the reception of more than one intent.

This fix checks for the work profile and returns out of the function without starting another TestingSettings activity.

Flag: EXEMPT bug fix
Bug: 406016005
Test: manual test opening hidden menu, and opening after reboots
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:170fcaf31628d3faf689ce1b525bfba33052d877)
Merged-In: I5a7937ba484afd3ba81c55e66bc53c217a778d18
Change-Id: I5a7937ba484afd3ba81c55e66bc53c217a778d18
 2025-04-01 20:42:13 -07:00
Android Build Coastguard Worker
c8c292cede Merge cherrypicks of ['googleplex-android-review.googlesource.com/32650559', 'googleplex-android-review.googlesource.com/32797479'] into 25Q2-release. 
Change-Id: I675d8e59031d99c15c86135c9ecd8797f66deea9
 2025-03-31 20:55:39 -07:00
tom hsu
c8b730509d [Satellite] Restrict requestIsSupported only in Manual type 
- SatelliteManager#requestIsSupported only can be used in Manual
   conneciton type. Hence add a type check with this API for the
   condition check

Flag: EXEMPT bug fix
Fix: b/395811260
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d033f603b819c5b1264d116648c9f6f00b061320)
Merged-In: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
Change-Id: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
 2025-03-31 20:54:29 -07:00
tom hsu
e9e45b4a01 [Satellite] Refactor API usage to Util class. 
Flag: EXEMPT refactor
Fix: b/403149290
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8916db934fb3d7dc1f94f67c7b409beeff2c6ac6)
Merged-In: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
Change-Id: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
 2025-03-31 20:54:17 -07:00
Android Build Coastguard Worker
94029d5c7c Snap for 13264465 from 0773c4d93f to 25Q2-release 
Change-Id: I1ce8a575e4f55decafe0d4417744842b723774b2
 2025-03-24 18:42:58 -07:00
Yuri Lin
0773c4d93f Merge "Merge bundle global & type preference controllers." into main 2025-03-24 12:13:24 -07:00
Bill Yi
06be21bc9c Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-03-24 11:00:12 -07:00
Bill Yi
7cf2266074 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2025-03-24 11:00:12 -07:00
Chun Zhang
c6aa5cb8cb Merge "Check client null before calling and closing." into main 2025-03-24 10:16:18 -07:00
Chun Zhang
e4ff8c403c Check client null before calling and closing. 
Bug: 404955994
Test: TreeHugger
Test: manual
Test: atest SafetySourceBroadcastReceiverTest
Test: atest LockScreenSafetySourceTest
Test: atest ActiveUnlockStatusUtilsTest
Test: atest WearSafetySourceTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: I34085b90fe41283e484d3b2235426676d886e69c
 2025-03-24 15:11:24 +00:00
Treehugger Robot
dc01092e3b Merge "Customize Fingerprint Enroll FindSensor Activity" into main 2025-03-24 07:21:29 -07:00
Milton Wu
08b35a8729 Customize Fingerprint Enroll FindSensor Activity 
Provide an interface for ODM/OEM to override fingerprint enrollment
findSensor page

Bug: 394232846
Flag: EXEMPT interface change
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL
      --ez skip_intro true
Change-Id: Iff61f0be49faf3581fa2b26e364ac8c8d61bdbf3
 2025-03-24 02:12:54 -07:00
Zhibin Liu
32bc5aab59 Merge "Add support to configure state of operator name in status bar [2/2]" into main am: 7c598253ff 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3516771

Change-Id: Icbafc5ffafb3181412e181800505c3d8be6ae5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-03-24 00:57:43 -07:00
Zhibin Liu
7c598253ff Merge "Add support to configure state of operator name in status bar [2/2]" into main 2025-03-24 00:15:24 -07:00
Android Build Coastguard Worker
bf78382d8c Snap for 13259233 from c7d2bc8cb4 to 25Q2-release 
Change-Id: Ife57419a3417ee6028c8c3e6a62026d0160963e8
 2025-03-23 17:00:16 -07:00