GitLab

* commit 'eff1ead8':
  Import translations. DO NOT MERGE

Change-Id: I3c1e38974ad6e223d7db69e9843819bc47d2f3dc
Auto-generated-cl: translation import

am 7ee164ce: (-s ours) am 0e416a72: (-s ours) am a9bb55e5: (-s ours) Import translations. DO NOT MERGE

* commit '7ee164ce':
  Import translations. DO NOT MERGE

* commit '0e416a72':
  Import translations. DO NOT MERGE

* commit 'd6a3f92e':
  Import translations. DO NOT MERGE

* commit 'a9bb55e5':
  Import translations. DO NOT MERGE

Change-Id: Ic45c68a47cf742b7518a3ef2ccd5252acb399cd8
Auto-generated-cl: translation import

Change-Id: Idcd48a28d4e814d5c4ac1dfce3c5ea2f3b740492
Auto-generated-cl: translation import

am 04f324af: (-s ours) am 1465b6d7: (-s ours) am c9d7506c: (-s ours) Import translations. DO NOT MERGE

* commit '04f324af':
  Import translations. DO NOT MERGE

* commit '779dcbfc':
  Import translations. DO NOT MERGE

* commit '600f96bb':
  Change MNC codename to just M.

* commit '1465b6d7':
  Import translations. DO NOT MERGE

* commit 'c9d7506c':
  Import translations. DO NOT MERGE

Change-Id: Ie443d413982eddb6239b4e1849d4a7a83091089f
Auto-generated-cl: translation import

Change-Id: Ia340edbdb766ab880c40aff648dbf15f336567a5
Auto-generated-cl: translation import

* commit '1485991e':
  Change MNC codename to just M.

am 6393ca74: am 725834d6: am 5407d5c3: Resolve default alarm ringtone URI when computing their title

* commit '6393ca74':
  Resolve default alarm ringtone URI when computing their title

* commit '725834d6':
  Resolve default alarm ringtone URI when computing their title

* commit '5407d5c3':
  Resolve default alarm ringtone URI when computing their title

Default URI that resolves to an internal URI should always be allowed.
e.g. "Default (Oxygen)"

Default URI that resolves to an external URI should only be allowed
if the user has granted the READ_EXTERNAL_STORAGE permission.
e.g. "Custom Ringtone" without perm; "Default (Some Name)" with perm

Bug: 22855800
Change-Id: Ibca0f2dd99bcf297a46d309b16665023cc4bc725

* commit '32f20c99':
  Execute cleanup code in a new app instance after a restore

* commit 'ebf56a31':
  Execute cleanup code in a new app instance after a restore

* commit '32e2e044':
  Execute cleanup code in a new app instance after a restore

BackupAgent.onRestoreFinished() is not called in a context that
allows the use of ContentResolver. Given that DeskClock will be
killed by the restore procedure in short order after
onRestoreFinished(), a callback into the application is scheduled
for 10 seconds in the future. When the callback invokes a
BroadcastReceiver within DeskClock, it detects the presence of
 freshly restored data (via a shared preference) and executes a
clean up procedure from within the normal application context.

Bug: 22786516
Change-Id: Ia024529cf962ed6e6235aecc362dedf8f1cbd9c3

Change-Id: I95d58040b871be7966d446b2eb1dce53ef13cd03

am 82dd8bb2: (-s ours) am 17a237e4: (-s ours) am 0e42eb54: (-s ours) Import translations. DO NOT MERGE

* commit '82dd8bb2':
  Import translations. DO NOT MERGE

* commit '17a237e4':
  Import translations. DO NOT MERGE

* commit '0e42eb54':
  Import translations. DO NOT MERGE

* commit '09cf9976':
  Import translations. DO NOT MERGE

Change-Id: I0cfaae1423b924141e8a249b0454548cd87d9c11
Auto-generated-cl: translation import

Change-Id: Ice23fe56bd3838d252856adafffd4121049117da
Auto-generated-cl: translation import

am c12571d0: am ee756cff: am 21fa0866: (-s ours) Merge "Allow authority to be set from build configuration - DO NOT MERGE" into ub-deskclock-business

* commit 'c12571d0':
  Allow authority to be set from build configuration - DO NOT MERGE

am ee756cff: am 21fa0866: (-s ours) Merge "Allow authority to be set from build configuration - DO NOT MERGE" into ub-deskclock-business

* commit 'ee756cff':
  Allow authority to be set from build configuration - DO NOT MERGE

am 21fa0866: (-s ours) Merge "Allow authority to be set from build configuration - DO NOT MERGE" into ub-deskclock-business

* commit '21fa0866':
  Allow authority to be set from build configuration - DO NOT MERGE

* commit '7b4833c3':
  Recreate all AlarmInstances on restore

Merge "Allow authority to be set from build configuration - DO NOT MERGE" into ub-deskclock-business

* commit 'c4de03a1':
  Recreate all AlarmInstances on restore

* commit '1f53186f':
  Recreate all AlarmInstances on restore

This approach guarantees that no AlarmInstance state from the
backup device influences behavior on the restore device.

All newly scheduled AlarmInstances will be for the future. There
cannot be, for example, notifications for AlarmInstances that
were missed on the backup device.

Bug: 22798579
Change-Id: Ia73bcc16c683cb0e3602f39028a347b30900fbd4