Seigo Nonaka
b115719dd4
Remove unnecessary log message.
...
This message was introduced locally for debugging but unexpectedly
upstreamed to master branch.
Change-Id: I6a6da19f6e41b22ed6f7da85ffcc23861852c248
2016-06-20 14:36:26 +09:00
Svetoslav Ganov
1b288ed197
Merge \\\"Fix a race in local settings caches\\\" into nyc-dev am: f4ddb7ce30 am: ee4c0a3c7e
...
am: 235411a3bc
2016-06-18 02:29:12 +00:00
Svetoslav Ganov
235411a3bc
Merge \\"Fix a race in local settings caches\\" into nyc-dev am: f4ddb7ce30
...
am: ee4c0a3c7e
2016-06-18 00:42:16 +00:00
Svetoslav Ganov
ee4c0a3c7e
Merge \"Fix a race in local settings caches\" into nyc-dev
...
am: f4ddb7ce30
2016-06-18 00:38:28 +00:00
Calvin On
173600e853
Merge \\\"Fix race with BT disable in BLE_ON_STATE\\\" into nyc-dev am: 1bf8782605 am: c535f2a520
...
am: db78416206
2016-06-18 00:30:33 +00:00
TreeHugger Robot
f4ddb7ce30
Merge "Fix a race in local settings caches" into nyc-dev
2016-06-18 00:30:28 +00:00
Andre Eisenbach
db78416206
Merge \\"Fix race with BT disable in BLE_ON_STATE\\" into nyc-dev am: 1bf8782605
...
am: c535f2a520
2016-06-18 00:25:17 +00:00
Calvin On
c535f2a520
Merge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
...
am: 1bf8782605
2016-06-18 00:20:14 +00:00
Yohei Yukawa
045de3f08c
Merge \\"API Rename: IC#inputContent to IC#commitContent.\\" into nyc-mr1-dev am: 01e7c10d37
...
am: 0d7dcf7bc3
2016-06-17 23:38:28 +00:00
Yohei Yukawa
0d7dcf7bc3
Merge \"API Rename: IC#inputContent to IC#commitContent.\" into nyc-mr1-dev
...
am: 01e7c10d37
2016-06-17 23:31:12 +00:00
Yohei Yukawa
01e7c10d37
Merge "API Rename: IC#inputContent to IC#commitContent." into nyc-mr1-dev
2016-06-17 23:23:59 +00:00
Svetoslav Ganov
8c35dcc7ae
Fix a race in local settings caches
...
We send a handle to the generation tracker along with the first accessed
setting but don't send the generation id of when the setting was
actually looked up. So by the time the client gets the setting with the
generation tracker from which to get and cache the last generation the
setting may have changed. We need to pass the generation id along with
the value and the generation tracker.
bug:29458487
Change-Id: I0ac4955ba5b10b547f8fe653a7c28e048a4691eb
2016-06-17 15:30:45 -07:00
Makoto Onuki
cb0f366fe2
Merge \\"Update manifest shortcut XML schema\\" into nyc-mr1-dev am: a65d8b6609
...
am: 5a533c9ae3
2016-06-17 21:51:37 +00:00
John Reck
29d562fa01
Merge \\"Move SurfaceView offscreen if the app stops drawing it\\" into nyc-mr1-dev am: e66dedf35b
...
am: 61513724f0
2016-06-17 21:51:20 +00:00
Jason Monk
6831aee5fa
Merge \\\"QS API: Fix mService and mTile being null once and for all\\\" into nyc-dev am: fc70b07385 am: c552a36992
...
am: 6a06372bb9
2016-06-17 21:49:07 +00:00
Chong Zhang
a87c74d7e1
Merge \\\"Do a forceLayout if pending insets is changed after relayout window\\\" into nyc-dev am: 2756d0707f am: dba235d91a
...
am: 788f4309ac
2016-06-17 21:48:58 +00:00
Calvin On
a0b91d77d6
Fix race with BT disable in BLE_ON_STATE
...
This will restart the BT stack when it detects a transition
into OFF state while the user enable flag (mEnable) is set.
Bug: 29363429
Change-Id: I9839119b34c4694ad92e96240c6989008b2f8d52
2016-06-17 21:18:21 +00:00
Christopher Tate
3a4a018572
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c am: 1c3be1a5b1 am: 6b24c84fa2
...
am: 6bf184819c
2016-06-17 21:10:51 +00:00
ugo_yu
d169da95a6
Merge \\"Correct typo in BluetoothSap binder\\" into nyc-mr1-dev am: 0db08ca3e7
...
am: 2380af193e
2016-06-17 21:04:18 +00:00
Yorke Lee
0933cf3f15
Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am: f33af2285b am: 3d80871032
...
am: 11e3bf5d30
2016-06-17 20:42:14 +00:00
Gina Dimino
4926ee18c0
Merge \\\"Docs: Suppress errors in SystemApi Build Bug: 28427390\\\" into nyc-dev am: d06520a488 am: b7181150c4
...
am: cb08f6805a
2016-06-17 20:42:09 +00:00
Makoto Onuki
5a533c9ae3
Merge \"Update manifest shortcut XML schema\" into nyc-mr1-dev
...
am: a65d8b6609
2016-06-17 20:40:16 +00:00
Makoto Onuki
a65d8b6609
Merge "Update manifest shortcut XML schema" into nyc-mr1-dev
2016-06-17 20:29:38 +00:00
John Reck
61513724f0
Merge \"Move SurfaceView offscreen if the app stops drawing it\" into nyc-mr1-dev
...
am: e66dedf35b
2016-06-17 20:20:38 +00:00
John Reck
e66dedf35b
Merge "Move SurfaceView offscreen if the app stops drawing it" into nyc-mr1-dev
2016-06-17 20:13:20 +00:00
Makoto Onuki
df6da040e0
Update manifest shortcut XML schema
...
Use the standard <intent> tag instead of custom tags.
- Also fix setDynamicShortcuts(), which was broken in the previous CL.
- Also tolerate runtime exceptions while parsing XMLs
- Also fix b/29422018 while I'm at it
Bug 29390156
Bug 29077932
Bug 29422018
Change-Id: I2756c9d66c6d7b2962a982d9e57a7d84a5755b28
2016-06-17 11:51:20 -07:00
Jason Monk
6a06372bb9
Merge \\"QS API: Fix mService and mTile being null once and for all\\" into nyc-dev am: fc70b07385
...
am: c552a36992
2016-06-17 18:50:05 +00:00
Jason Monk
c552a36992
Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
...
am: fc70b07385
2016-06-17 18:45:04 +00:00
TreeHugger Robot
fc70b07385
Merge "QS API: Fix mService and mTile being null once and for all" into nyc-dev
2016-06-17 18:38:26 +00:00
Chong Zhang
788f4309ac
Merge \\"Do a forceLayout if pending insets is changed after relayout window\\" into nyc-dev am: 2756d0707f
...
am: dba235d91a
2016-06-17 18:32:31 +00:00
Dianne Hackborn
c0359bf7d4
Merge \\\"Fix issue #29371078 : Foreground jobs should not count...\\\" into nyc-dev am: 47cfac6803 am: 403e103eb2
...
am: e022330079
2016-06-17 18:26:54 +00:00
Chong Zhang
dba235d91a
Merge \"Do a forceLayout if pending insets is changed after relayout window\" into nyc-dev
...
am: 2756d0707f
2016-06-17 18:26:45 +00:00
John Reck
aa6e84f21d
Move SurfaceView offscreen if the app stops drawing it
...
Bug: 29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
2016-06-17 10:23:54 -07:00
Yohei Yukawa
adebb52588
API Rename: IC#inputContent to IC#commitContent.
...
As shown in below, we have already used commit* naming convention in
InputConnection.
- InputConnection#commitCompletion(CompletionInfo);
- InputConnection#commitCorrection(CorrectionInfo);
- InputConnection#commitText(CharSequence, int);
Hence renaming IC#inputContent() to IC#commitContent() would make the
new method more consistent.
Bug: 29450024
Change-Id: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
2016-06-17 10:10:39 -07:00
Christopher Tate
4f7b337cdd
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
...
am: 1c3be1a5b1
2016-06-17 17:09:13 +00:00
Jason Monk
a3453b8bd9
QS API: Fix mService and mTile being null once and for all
...
Change-Id: Idd82e4c2f6cfc2b30432e15e23963c1d7a959e43
Fixes: 29121793
2016-06-17 13:04:05 -04:00
Christopher Tate
6bf184819c
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c am: 1c3be1a5b1
...
am: 6b24c84fa2
2016-06-17 06:50:28 +00:00
Seigo Nonaka
99a8e2faac
Merge "Follow the minikin namespace changes"
2016-06-17 03:59:53 +00:00
ugo_yu
2380af193e
Merge \"Correct typo in BluetoothSap binder\" into nyc-mr1-dev
...
am: 0db08ca3e7
2016-06-17 01:43:28 +00:00
Chong Zhang
71f2c31469
Do a forceLayout if pending insets is changed after relayout window
...
We might have a pending MSG_RESIZED_REPORT, but if it's executed after
relayoutWindow, mPendingInsets will already be the new value and it'll
not forceLayout. So we need to forceLayout here to make sure the measure
cache is cleared.
bug: 29391054
Change-Id: I73793b1427b89e75700369ec3b37053a6a732f0d
2016-06-17 01:11:49 +00:00
TreeHugger Robot
0db08ca3e7
Merge "Correct typo in BluetoothSap binder" into nyc-mr1-dev
2016-06-17 01:02:47 +00:00
Christopher Tate
6b24c84fa2
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
...
am: 1c3be1a5b1
2016-06-17 00:38:13 +00:00
Christopher Tate
1c3be1a5b1
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e
...
am: d2a4e1b39c
2016-06-17 00:32:26 +00:00
Christopher Tate
d2a4e1b39c
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab
...
am: e2c9b1af3e
2016-06-17 00:24:29 +00:00
Christopher Tate
e2c9b1af3e
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
...
am: d6c1126fab
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab
resolve merge conflicts of cffb19c to mnc-dev
...
am: 3f9ea2d386
2016-06-17 00:15:07 +00:00
Christopher Tate
3f9ea2d386
resolve merge conflicts of cffb19c to mnc-dev
...
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
2016-06-16 16:31:39 -07:00
Christopher Tate
cffb19c812
Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7
...
am: ec6c3f7a32
2016-06-16 22:30:17 +00:00
Christopher Tate
ec6c3f7a32
Don\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f
...
am: cd777e95a7
2016-06-16 22:27:04 +00:00
Christopher Tate
cd777e95a7
Don\'t trust callers to supply app info to bindBackupAgent()
...
am: c58054f25f
2016-06-16 22:21:37 +00:00
