Commit Graph

53801 Commits

Author SHA1 Message Date
Raff Tsai
592e5c1491 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours
am: 290b4e507c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I7339c87760c9aac2c435178b03b62a936f498662
2019-06-05 02:35:45 -07:00
Raff Tsai
723fb8dc91 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours
am: 290b4e507c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I591d8c07e4e21109315a9b7b600b52ba7000c3cc
2019-06-05 02:35:44 -07:00
Raff Tsai
a9125587a4 [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours am: 0b36c5e9ba -s ours am: e7c298885b -s ours
am: ca593c204a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I1030cc07ec491766f65c59fc45d8ceb8bc08a011
2019-06-05 02:35:04 -07:00
Raff Tsai
7d3edc88a9 [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours am: 0b36c5e9ba -s ours am: e7c298885b -s ours
am: ca593c204a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I4ef72ed7f78528edf72d003de251542d22515025
2019-06-05 02:35:02 -07:00
Raff Tsai
7a7a4f3019 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours am: 20b5a01f6c -s ours am: 2d387349db -s ours
am: f7cd796ea8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I3703a33f61f1d3ee56d6223f680548e06d8ba997
2019-06-05 02:34:55 -07:00
Raff Tsai
152f4c8345 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours am: 20b5a01f6c -s ours am: 2d387349db -s ours
am: f7cd796ea8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I3cf51b30f82e33d55b49863d58fa27544a8ff0eb
2019-06-05 02:34:53 -07:00
Raff Tsai
a33cd2c168 [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours am: d20d75c39b -s ours am: 971190b08a -s ours
am: ab2ad075b3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Iad7b242d3b85102d68ace5426ff9dd25cad04454
2019-06-05 02:34:38 -07:00
Raff Tsai
05b744c5eb [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours am: d20d75c39b -s ours am: 971190b08a -s ours
am: ab2ad075b3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I04a28cd6ae30944bbf1c9208843fd5d8abf86beb
2019-06-05 02:34:37 -07:00
Raff Tsai
acac31e75a [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours
am: 64d4433a90 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I0588eac0a4abcb1003b09e5fab92894a8ddfc8f9
2019-06-05 02:30:17 -07:00
Raff Tsai
290b4e507c [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours
am: ba0122401d -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ib7ded3d2c08e14e39922ad0f1dd1fb2dd3e27ab9
2019-06-05 02:29:51 -07:00
Raff Tsai
ca593c204a [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours am: 0b36c5e9ba -s ours
am: e7c298885b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I4a6b3d7b7aaf30bf3abddf9b276e666462a9d831
2019-06-05 02:29:05 -07:00
Raff Tsai
f7cd796ea8 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours am: 20b5a01f6c -s ours
am: 2d387349db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I27f9a530b3814c723726e43e8902651da3bfa937
2019-06-05 02:28:55 -07:00
Raff Tsai
ab2ad075b3 [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours am: d20d75c39b -s ours
am: 971190b08a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ic3814c5b17fe748c35e11034d75549104e7de429
2019-06-05 02:28:42 -07:00
Raff Tsai
64d4433a90 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours
am: 3e1ae79428 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ia0dc8b4e6b5795fb03c30867d77460389bb49155
2019-06-05 02:25:23 -07:00
Raff Tsai
ba0122401d [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours
am: 5a326027db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I923b0a55fd8458fa30295fa1f9ca7a31f13d2734
2019-06-05 02:24:54 -07:00
Raff Tsai
e7c298885b [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours am: c808f15cbe -s ours
am: 0b36c5e9ba -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Id32040250480a5ad2e957eaeb4eea5b4dcc6633b
2019-06-05 02:22:55 -07:00
Raff Tsai
2d387349db [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours am: 530fa8b25b -s ours
am: 20b5a01f6c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I656e7e0fac7c63c55f82bfc01183e69adfe2164b
2019-06-05 02:22:46 -07:00
Raff Tsai
971190b08a [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours am: 59348982d3 -s ours
am: d20d75c39b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: If4596f7e943656ccb7bc06121fe77c5d6d76d627
2019-06-05 02:22:36 -07:00
Edgar Wang
e1a000f94f New strings for "Automatically lock"
Bug: 132106803
Test: manual
Change-Id: If6fe328ef6570cd96906435eb635576b324269c0
2019-06-05 17:19:48 +08:00
Raff Tsai
3e1ae79428 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours
am: 14302b3ac6 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ic1ddb22a97d9058d5e40b8fddfb3f6f4ef40e150
2019-06-05 02:19:30 -07:00
Raff Tsai
5a326027db [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours
am: 80fea5de92 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ic06c39295c0b1e82701cf1747606afff1e27fd68
2019-06-05 02:19:03 -07:00
Raff Tsai
0b36c5e9ba [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours
am: c808f15cbe -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ia806284e60b86d6d942de73a98d8ef3b48cd6847
2019-06-05 02:17:52 -07:00
Raff Tsai
20b5a01f6c [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours
am: 530fa8b25b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Iaa5411ff17dddbda7b6584afff8f0a7527609c23
2019-06-05 02:17:44 -07:00
Raff Tsai
d20d75c39b [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours
am: 59348982d3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I50749ba4c4a8478acbd70a729fb6e4f1e722254d
2019-06-05 02:17:35 -07:00
Raff Tsai
14302b3ac6 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am: 09e255676b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407
2019-06-05 02:13:22 -07:00
Raff Tsai
80fea5de92 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am: 8c612b1334 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I252ffcb3e7c5f1be519c9e809d6b43a296bcbe9d
2019-06-05 02:12:49 -07:00
Raff Tsai
c808f15cbe [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
am: 65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd
2019-06-05 02:12:01 -07:00
Raff Tsai
530fa8b25b [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
am: bfe5b37bc8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I68b5c6aebfd69660c51613b6a96ef0c354d800ae
2019-06-05 02:11:52 -07:00
Raff Tsai
59348982d3 [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0
am: 6dbb3108a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I171e67f778cd8e8f67cb8d685ecfe09316619cf5
2019-06-05 02:11:36 -07:00
TreeHugger Robot
09e255676b Merge changes from topic "security_fix_settings" into oc-dev
* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e
  Do not allow draw on top for App notification settings
2019-06-05 09:02:31 +00:00
TreeHugger Robot
8c612b1334 Merge changes from topic "security_fix_settings" into oc-dev
* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
  Do not allow draw on top for App notification settings
2019-06-05 09:02:31 +00:00
Android Build Merger (Role)
65294e6ee5 [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
Change-Id: I45fe88086caf9220b67162863828d3bf0ea30d7f
2019-06-05 02:50:10 +00:00
Android Build Merger (Role)
0b52ca4693 [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96
Change-Id: I6f8236a1de4c8edc766ae625fe0010924e4cfba3
2019-06-05 02:50:07 +00:00
Android Build Merger (Role)
ed126b5d96 [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e
Change-Id: I5ed98836a8659baedf50724ce1f65c76bcace5ef
2019-06-05 02:50:04 +00:00
Android Build Merger (Role)
6dbb3108a7 [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0
Change-Id: I0b4d8af9f5306150b58fb5cc8e10ba192458a458
2019-06-05 02:48:34 +00:00
Android Build Merger (Role)
bfe5b37bc8 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
Change-Id: I8f2da352d0658de16a2b4087067a57fa7cf40ad6
2019-06-05 02:37:14 +00:00
Android Build Merger (Role)
ceb1ed0a09 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631
Change-Id: Ief79f2f50874bbfcd214b1ce3248b10532a24452
2019-06-05 02:37:12 +00:00
Android Build Merger (Role)
188904e631 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d
Change-Id: I9f55b76cc7079a2eb682c2093f57ac0c58e524c9
2019-06-05 02:37:11 +00:00
Android Build Merger (Role)
8f70c24f2d [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f
2019-06-05 02:37:09 +00:00
Android Build Merger (Role)
e537ffece8 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02
2019-06-05 02:37:07 +00:00
Bill Yi
c1780aeb59 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3d9c7cb356 -s ours
am: e655774644 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia9f9883e4e516cb87dd8544098333660e948ed46
2019-06-04 19:12:23 -07:00
Alexey Kuzmin
bfc327ad9d Move vibration preview invokation to the correct place am: f8eb8c3c90
am: ef530610fa

Change-Id: I1c4c21b5b1e5246f3625399bb2b911672224f550
2019-06-04 19:07:44 -07:00
Bill Yi
d7c96d4ff4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3d9c7cb356 -s ours
am: 7ff72e6d75 -s ours
am skip reason: subject contains skip directive

Change-Id: Id1aa4180b46dc3b3028582945a98aa3fbb8f0dfd
2019-06-04 18:53:13 -07:00
Alexey Kuzmin
e8200af63a Move vibration preview invokation to the correct place am: f8eb8c3c90
am: df51217157

Change-Id: I35c08d49566a58b6add49f807b48a4c6a2afb918
2019-06-04 18:51:10 -07:00
Kevin Chyn
2ec0c38e1f Merge changes from topic "face-settings-challenge" into qt-r1-dev
am: b979a38c8d

Change-Id: I3fd5ba0467eec804d75a5ceb08c56700d7e07b64
2019-06-04 18:48:33 -07:00
Michael Groover
2123e3543c Remove developer option to disable device ID access restrictions
Bug: 123937881
Test: Manually verified developer option is no longer available.
Change-Id: I00e8db23d88a5c84e273dfa4b8f797fa2a995de0
2019-06-04 18:30:21 -07:00
Bill Yi
e655774644 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 3d9c7cb356 -s ours
am skip reason: subject contains skip directive

Change-Id: I87aca396c35ec9f0db74cb9079997a3995efbab5
2019-06-04 18:25:55 -07:00
Alexey Kuzmin
ef530610fa Move vibration preview invokation to the correct place
am: f8eb8c3c90

Change-Id: Idb50c3733fd1e127149bc3d48c1ac281638b6cd9
2019-06-04 18:16:10 -07:00
Bill Yi
7ff72e6d75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 3d9c7cb356 -s ours
am skip reason: subject contains skip directive

Change-Id: Id4ebeff5c481ede8d583bd59e4eabd1d3a7dcbe1
2019-06-04 18:09:12 -07:00
Alexey Kuzmin
df51217157 Move vibration preview invokation to the correct place
am: f8eb8c3c90

Change-Id: I252301516d7be6b5026e4fba5b5e9144889f6b1f
2019-06-04 18:00:48 -07:00