Commit Graph

251461 Commits

Author SHA1 Message Date
Dianne Hackborn
5cb766a9cd Fix issue #30929080: Default Assist app is set to None...
am: e9563659a5

Change-Id: I738c1126ffbffaa904e7d4533347a218a0ccecdd
2016-08-23 14:51:30 +00:00
Todd Kennedy
a09f3f28ef Merge "Allow permission group updates" into nyc-mr1-dev
am: ee2df0390e

Change-Id: I1c88a2863ddb2a60d94a5a84d49103789b849d42
2016-08-23 14:46:29 +00:00
Todd Kennedy
873b0f563e Allow permission group updates
am: 21bd9b824f

Change-Id: I8f938705b6f25b2bd53410f5b496191ec2784a9c
2016-08-23 14:46:25 +00:00
Todd Kennedy
5cc6bf0ead Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev
am: 0060d6eda1

Change-Id: Ia8fb43fceea7f13a035a719a969e833b45e99408
2016-08-23 14:46:18 +00:00
Todd Kennedy
76a12e177c Don't call into pkg mgr svc w/ lock held
am: f29d07a62a

Change-Id: Iffd22d7e33a0870236576033658d420c22426b97
2016-08-23 14:46:12 +00:00
Tenghui Zhu
52feb6b956 Merge "Correctly report the transparent region" into nyc-mr1-dev
am: f05765e3c4

Change-Id: I9978bb78a2ccd63ceccbab89bb7c783237c0f97f
2016-08-23 14:46:02 +00:00
Teng-Hui Zhu
94a2f7e6fd Correctly report the transparent region
am: f8da30dc65

Change-Id: I2fa623c2893a6cea96843f78d46fe753913b6f4d
2016-08-23 14:45:55 +00:00
Salvador Martinez
0c216301b6 Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
am: 09b64ade22

Change-Id: I22142397ad0af75eb29ed2ba2b764f87d34825ca
2016-08-23 14:45:43 +00:00
Salvador Martinez
aebce41a88 Prevent wifi icon from disappearing
am: 823cd0e35a

Change-Id: I55a99176048dd30b46ae4ea2900b92e929c3a374
2016-08-23 14:43:31 +00:00
Rob Carr
b97dc0a5a8 Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev
am: b19915bea8

Change-Id: Ie2f4ab820f05ee91b4e0f45f3bfdc24801a44d81
2016-08-23 14:43:23 +00:00
Robert Carr
d4f839c477 PopupWindow: Be more consistent about Gravity calculation.
am: 798fb79866

Change-Id: Ia7c49dbe2fbe751565d6c8be46586a66c535a148
2016-08-23 14:43:21 +00:00
Tenghui Zhu
1c06a4dcc7 Merge "Update the javaDoc for VectorDrawable and AnimatedVectorDrawable" into nyc-mr1-dev
am: 5cb0c13f76

Change-Id: I39f5fa1b99680d4d62ee157bdb2e5c65d09e9365
2016-08-23 14:38:50 +00:00
Teng-Hui Zhu
ab19598584 Update the javaDoc for VectorDrawable and AnimatedVectorDrawable
am: d64255f61d

Change-Id: I3999edd101b3188139c4dfd80b106820e1c9fdfc
2016-08-23 14:38:47 +00:00
Fan Zhang
17dc1ad151 Merge "Update navup button content description when it's menu." into nyc-mr1-dev
am: bf1d4cae3b

Change-Id: I44c5ebf3d83c707e9e2abb246a70c324d1e32fd4
2016-08-23 14:38:41 +00:00
Fan Zhang
a902d61eb6 Update navup button content description when it's menu.
am: c10db985f3

Change-Id: I1f954904540791d747540e102ce038866675b08a
2016-08-23 14:38:37 +00:00
Steve McKay
477c383cea Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev
am: 8499c13740

Change-Id: Ia3197b91667864b7353d4e047b04fe9dc9d2ed1b
2016-08-23 14:38:31 +00:00
Steve McKay
6c06272a12 DO NOT MERGE: Treat unknown tooltype as touch.
am: 0c28f3bda3

Change-Id: Idbee59d7450b63735291f5218784c87f762ed19b
2016-08-23 14:38:27 +00:00
Sungmin Choi
9d5514c81a Merge "telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network" into nyc-mr1-dev
am: 156d897f2e

Change-Id: Ia3421b6cbfdf858d2cfb77acd607c239da9497a9
2016-08-23 14:38:21 +00:00
Sungmin Choi
c461691675 telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network
am: fd80d5482a

Change-Id: I2a11a4fecd14cce3362fb3d9e4416df923a7458d
2016-08-23 14:38:17 +00:00
Sanket Padawe
f3f5022a7f Merge "Fix roam icon issues in Austria" into nyc-mr1-dev
am: 914354f334

Change-Id: Ice1d8843cb05a5bd788f14554c863837963c5f78
2016-08-23 14:38:09 +00:00
Sungmin Choi
d1c8ab5566 Fix roam icon issues in Austria
am: f8912fc489

Change-Id: I2feb5bb95386316d209031db03dd14ba8b546aaa
2016-08-23 14:38:02 +00:00
Chong Zhang
ac2c6b307e Merge "Make sure surface control is really valid before giving it to client" into nyc-mr1-dev
am: f9f8e82045

Change-Id: I1d909be6bfa2f13dd05e170b87c11101525e6cf9
2016-08-23 14:30:23 +00:00
Chong Zhang
d3edf1e799 Make sure surface control is really valid before giving it to client
am: 7581cddf25

Change-Id: Ibc06a598f98c14f9a986ab91fdb1d4b04152b65c
2016-08-23 14:30:19 +00:00
Raph Levien
ddc50bb7d9 Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev
am: e7ab3e1650

Change-Id: Iee7e2e454c63afbcd20f93e1a534c5f595f16101
2016-08-23 14:30:13 +00:00
Raph Levien
b1581dbbfd Update lint check to accommodate new emoji sequences
am: 0790ac68bc

Change-Id: Id179440ba304c40c498555389deb7b9cad7dcd9f
2016-08-23 14:30:08 +00:00
Randy Pan
69f7492184 Merge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev
am: dd056b9422

Change-Id: Id8e4b7666b0ff65ced28a4b53ff85dbba5a1ae17
2016-08-23 14:30:00 +00:00
Randy Pan
1f7453e79c Deprecate QNS network disable reason BAD_LINK
am: 7d82f98b8f

Change-Id: Ic3a92aaed8a56cf61c6bd100811bafb009613daa
2016-08-23 14:29:35 +00:00
Makoto Onuki
9594d78a45 Merge "Off-load unlocking users onto a worker thread" into nyc-mr1-dev
am: 8b47748b9c

Change-Id: I63ef0697035803b1d4caf3a5dd67e6e68791696b
2016-08-23 14:29:19 +00:00
Makoto Onuki
035cfcd21d Off-load unlocking users onto a worker thread
am: 085a05cd86

Change-Id: I85994decc805888099fc97bcb34119468a48a4f4
2016-08-23 14:29:12 +00:00
Bill Yi
125d6479a0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: a6ec65edab  -s ours

Change-Id: I65b4042f322910f40767c05eea10dc4aaf171160
2016-08-23 14:29:01 +00:00
Bill Yi
85755a910e Import translations. DO NOT MERGE
am: 653c88ed61  -s ours

Change-Id: I74b015207a3d0d2b42739558326cb50a1e852a99
2016-08-23 14:28:56 +00:00
Bill Yi
d6e2c3ff06 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8aea3746cd  -s ours

Change-Id: I1d30271721ea9549ad66d3230d54dee67713f2e1
2016-08-23 14:22:54 +00:00
Bill Yi
a5b32eb046 Import translations. DO NOT MERGE
am: 225d865289  -s ours

Change-Id: Ibd4000f14a836183b386b6bf95a284e280431a65
2016-08-23 14:22:52 +00:00
Bill Yi
b19043ff85 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: c341e0b571  -s ours

Change-Id: I08fa4baa8902af90ef3d0009b4ae451da0437803
2016-08-23 14:22:49 +00:00
Bill Yi
71cd2b8449 Import translations. DO NOT MERGE
am: 8ac0dbea72  -s ours

Change-Id: I9d87c670c819ddaff3162b1c0f0189245db2274f
2016-08-23 14:22:47 +00:00
Bill Yi
99c97f5fb4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 7a944b3e5c  -s ours

Change-Id: Ie65f53ea0ebe39273e70b668ee090f2eea1cb7c1
2016-08-23 14:22:45 +00:00
Bill Yi
e8fd4589f1 Import translations. DO NOT MERGE
am: f71553f601  -s ours

Change-Id: If02dc06ed0015e3d5cd9ff737a62a66321eaf5df
2016-08-23 14:22:43 +00:00
Erik Kline
31ef78878e Merge "Ensure known good state when starting." into nyc-mr1-dev
am: e845cf22c1

Change-Id: Ic7901eebfe82855f67fd070501040829f39cb313
2016-08-23 14:22:40 +00:00
Erik Kline
226db19739 Ensure known good state when starting.
am: 703b0974e0

Change-Id: Ie79b1e4a67a4936a9c989ec6c6f2f278f4330e9a
2016-08-23 14:22:38 +00:00
Sailesh Nepal
7aaa861cd7 Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-mr1-dev
am: 5647c93e9e

Change-Id: I13512fa061612f7d6e296b8aadca825ebcad5577
2016-08-23 14:22:02 +00:00
Sailesh Nepal
bbfb97461d resolve merge conflicts of ad31603 to cw-f-dev
Change-Id: I970fe17c234f9b99142980f685c3c4efee4767fc
2016-08-23 07:04:30 -07:00
TreeHugger Robot
5ab8b4e75d Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-08-23 05:17:15 +00:00
Todd Kennedy
ee2df0390e Merge "Allow permission group updates" into nyc-mr1-dev 2016-08-22 23:18:48 +00:00
Todd Kennedy
0060d6eda1 Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev 2016-08-22 23:17:22 +00:00
Bill Yi
8213e7afca Import translations. DO NOT MERGE
Change-Id: I18cf83300428bd340ee2a13f908343dc05ab9f76
Auto-generated-cl: translation import
2016-08-22 15:29:51 -07:00
Nick Vaccaro
efc2c764f1 Merge "Fix some potential power-draining race conditions" into cw-f-dev 2016-08-22 21:57:22 +00:00
Tenghui Zhu
f05765e3c4 Merge "Correctly report the transparent region" into nyc-mr1-dev 2016-08-22 21:56:37 +00:00
Salvador Martinez
09b64ade22 Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev 2016-08-22 21:55:20 +00:00
Rob Carr
b19915bea8 Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev 2016-08-22 20:47:10 +00:00
Tenghui Zhu
5cb0c13f76 Merge "Update the javaDoc for VectorDrawable and AnimatedVectorDrawable" into nyc-mr1-dev 2016-08-22 20:35:44 +00:00