OSDN Git Service
Jaewan Kim [Thu, 21 Apr 2016 16:31:42 +0000 (16:31 +0000)]
Merge "PIP: Fix system UI crash" into nyc-dev
am:
28d9c9f7b2
* commit '
28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
PIP: Fix system UI crash
Change-Id: Ief778c79108ac6d2eb5e7b2406f9c6d1da6c8ca7
Youngsang Cho [Thu, 21 Apr 2016 16:23:00 +0000 (16:23 +0000)]
Merge "PIP: Fix system UI crash" into nyc-dev
Tony Mak [Thu, 21 Apr 2016 15:56:06 +0000 (15:56 +0000)]
Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
am:
d3589ee715
* commit '
d3589ee715e397e61025265adc883c9ed3be4f56':
Fix wrong app is launched after solving challenge from tapping notification
Change-Id: I9de441cca7574620fb3917adddbd911a8a935854
Julia Reynolds [Thu, 21 Apr 2016 15:56:04 +0000 (15:56 +0000)]
Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev
am:
54a6394cf9
* commit '
54a6394cf96423936e6f3548ed8d78ff82e6b247':
Accept the calendar name in addition to the owner as a calendar filter.
Change-Id: Id788bb4465b947d6b5515a3c1d560c337ea5c382
Tony Mak [Thu, 21 Apr 2016 15:51:13 +0000 (15:51 +0000)]
Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
Tony Mak [Thu, 21 Apr 2016 15:43:08 +0000 (16:43 +0100)]
Fix wrong app is launched after solving challenge from tapping notification
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.
Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.
Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix:
28309964
Julia Reynolds [Thu, 21 Apr 2016 15:36:29 +0000 (15:36 +0000)]
Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 15:31:47 +0000 (15:31 +0000)]
Merge "Always reevaluate rules when a new service is added." into nyc-dev
am:
a8574a1dfa
* commit '
a8574a1dfaa45089d392ebf05a8a82e4d8a1d82e':
Always reevaluate rules when a new service is added.
Change-Id: Ia9098705c487402bd987a1b55aec69a58fc67780
Keith Cheung [Thu, 21 Apr 2016 15:31:46 +0000 (15:31 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev
am:
39066abb59
* commit '
39066abb5929622a1918805bf85d19180c6dfe3d':
Include work app in battery optimization settings
Change-Id: I3603894e9aca5b1dbe2ed0f6615ac8467e470a82
Julia Reynolds [Thu, 21 Apr 2016 15:24:03 +0000 (15:24 +0000)]
Merge "Always reevaluate rules when a new service is added." into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 15:18:12 +0000 (15:18 +0000)]
Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev
am:
d0f2d1f9ac
* commit '
d0f2d1f9ace01c4e0581baa3f5eb0a694afca675':
Don't call into audiomanager holding a zen lock.
Change-Id: I8a7eee3478bca5d8bfd1262e68d136b58fda4884
Keith Cheung [Thu, 21 Apr 2016 15:18:06 +0000 (15:18 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 15:04:05 +0000 (15:04 +0000)]
Merge "Don't call into audiomanager holding a zen lock." into nyc-dev
Clara Bayarri [Thu, 21 Apr 2016 14:53:11 +0000 (14:53 +0000)]
Merge "Reinflate QS view on Locale configuration change" into nyc-dev
am:
98c7c05dde
* commit '
98c7c05dde8c288a4eab680af31b030813b8c87f':
Reinflate QS view on Locale configuration change
Change-Id: Ie27dce5dcd654771580d8295cca202a23954278b
Clara Bayarri [Thu, 21 Apr 2016 14:47:14 +0000 (14:47 +0000)]
Merge "Reinflate QS view on Locale configuration change" into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 14:46:16 +0000 (14:46 +0000)]
Merge "Volume updates should appear continuous when changed by touch." into nyc-dev
am:
db042644d5
* commit '
db042644d5f724d1c21c2ddd424de70aaf0d4195':
Volume updates should appear continuous when changed by touch.
Change-Id: I56e41e7af655547b32f230951a5e978cb59f96fd
Clara Bayarri [Thu, 21 Apr 2016 14:44:04 +0000 (14:44 +0000)]
Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev
am:
bcedd6b74f
* commit '
bcedd6b74f717dddb2e3e37385d1b4a4e82d949a':
Fix silent errors when launching Keyboard Shortcuts from Settings
Change-Id: I43938e09b83271cf48ddfe6bb6f956332f415c18
Julia Reynolds [Thu, 21 Apr 2016 14:24:27 +0000 (10:24 -0400)]
Always reevaluate rules when a new service is added.
Otherwise the condition providers may never get an
onSubscribe call and may not turn on at the right time.
Bug:
26981870
Change-Id: Ia622597f10cc26f7c34ece1748013655543f488f
Julia Reynolds [Tue, 19 Apr 2016 17:27:41 +0000 (13:27 -0400)]
Don't call into audiomanager holding a zen lock.
Bug:
27642196
Change-Id: Ib510f2ddf966f36b3670290a4f3f695bf6b7810e
TreeHugger Robot [Thu, 21 Apr 2016 14:33:48 +0000 (14:33 +0000)]
Merge "Volume updates should appear continuous when changed by touch." into nyc-dev
Clara Bayarri [Thu, 21 Apr 2016 14:28:57 +0000 (14:28 +0000)]
Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev
Paul Jensen [Thu, 21 Apr 2016 13:55:25 +0000 (13:55 +0000)]
Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
am:
3f45105353
* commit '
3f4510535397bf103d0299440a0299ff8bbeec28':
Cap number of NetworkRequests a UID can make to 100
Change-Id: I194acabb1f9e301d88a40af8ea1d088a3d2ec0d9
Paul Jensen [Thu, 21 Apr 2016 13:47:11 +0000 (13:47 +0000)]
Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
Clara Bayarri [Thu, 21 Apr 2016 13:28:47 +0000 (14:28 +0100)]
Reinflate QS view on Locale configuration change
The existing DensityContainer already did this for density changes,
repurposed it to handle other Configuration changes. Also renamed
to AutoReinflateContainer.
Bug:
27952059
Change-Id: Ieb572abcbafe49aec73b16e1bcb8c294011afdd3
Clara Bayarri [Fri, 15 Apr 2016 12:09:39 +0000 (13:09 +0100)]
Fix silent errors when launching Keyboard Shortcuts from Settings
The following error was thrown, given that Activity is generating a
protected broadcast:
Sending non-protected broadcast
android.intent.action.SHOW_KEYBOARD_SHORTCUTS from system
Bug:
28138503
Change-Id: I50d5212d7776d33ffe6e9df1c5f080205ac4a29d
Jaewan Kim [Thu, 21 Apr 2016 07:22:48 +0000 (16:22 +0900)]
PIP: Fix system UI crash
Bug:
28306480
Change-Id: Ie36f73c46f3ee8d6a2cb8264458cb0e0410aaecd
Erik Kline [Thu, 21 Apr 2016 05:28:28 +0000 (05:28 +0000)]
Merge "Expand NetworkMonitor metrics" into nyc-dev
am:
b99d6af3ab
* commit '
b99d6af3ab406db14d161cdc0000ed521957d7ca':
Expand NetworkMonitor metrics
Change-Id: I6fad2c6fa68c42d161f90abedf83624379b48c8d
TreeHugger Robot [Thu, 21 Apr 2016 05:24:38 +0000 (05:24 +0000)]
Merge "Expand NetworkMonitor metrics" into nyc-dev
Hugo Benichi [Thu, 21 Apr 2016 04:12:53 +0000 (04:12 +0000)]
Merge "Some fixes in ConnectivityService event logging" into nyc-dev
am:
7261fb27de
* commit '
7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
Some fixes in ConnectivityService event logging
Change-Id: Id07df8b694cab22baaa2f9ba849f03bafb9b5590
Hugo Benichi [Thu, 21 Apr 2016 04:03:58 +0000 (04:03 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev
am:
75f0346167
* commit '
75f0346167f9b8beb8d4b941e7a4ca8228e0737a':
Various fixes in IpReachability event logging
Change-Id: Ia20b9ef1a949b6474a5e09b096e6d34e41f316aa
Hugo Benichi [Thu, 21 Apr 2016 04:02:54 +0000 (04:02 +0000)]
Merge "Some fixes in ConnectivityService event logging" into nyc-dev
Erik Kline [Fri, 15 Apr 2016 06:49:42 +0000 (15:49 +0900)]
Expand NetworkMonitor metrics
- add netid to CaptivePortalStateChangeEvent
- add NetworkMonitorEvent for simple duration measurements
Bug:
28204408
Change-Id: I62035e07d64013878a0bce30c67c929c2c7e7a85
Hugo Benichi [Thu, 21 Apr 2016 03:54:17 +0000 (03:54 +0000)]
Merge "Various fixes in IpReachability event logging" into nyc-dev
Felipe Leme [Thu, 21 Apr 2016 03:44:13 +0000 (03:44 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
am:
333e808b34
* commit '
333e808b34397258457813b6d7d970da72e76925':
Removed obsolete screenshot mention from full bugreport.
Change-Id: I28e2617e7ee6efeeea025120637794584cdfd42d
TreeHugger Robot [Thu, 21 Apr 2016 03:34:45 +0000 (03:34 +0000)]
Merge "Removed obsolete screenshot mention from full bugreport." into nyc-dev
Adrian Roos [Thu, 21 Apr 2016 03:26:03 +0000 (03:26 +0000)]
Merge "Remove obsolete TODO" into nyc-dev
am:
568e63bc9b
* commit '
568e63bc9b53537505016f41e48e908c4da863e5':
Remove obsolete TODO
Change-Id: Iaf25259e51d0f4b69d58dc918033299e88aab124
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:26:01 +0000 (03:26 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
am:
69e3618f07
* commit '
69e3618f07be6f48bfc37c52e6ef5830f717b495':
Do not make files in zip disabled in ACTION_VIEW.
Change-Id: I6c4749738e1bc6116e4e56c494932a62d2c16ac9
TreeHugger Robot [Thu, 21 Apr 2016 03:18:46 +0000 (03:18 +0000)]
Merge "Remove obsolete TODO" into nyc-dev
Tomasz Mikolajewski [Thu, 21 Apr 2016 03:17:01 +0000 (03:17 +0000)]
Merge "Do not make files in zip disabled in ACTION_VIEW." into nyc-dev
Ruchi Kandoi [Thu, 21 Apr 2016 02:46:49 +0000 (02:46 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
am:
316c68f144
* commit '
316c68f144946a3019cc8f314921e8588c766b71':
fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link
Change-Id: I591073412c162c14800475261936790da3c22ef5
Ruchi Kandoi [Thu, 21 Apr 2016 02:37:48 +0000 (02:37 +0000)]
Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev
Nathan Harold [Thu, 21 Apr 2016 02:16:00 +0000 (02:16 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
am:
f6496db8ce
* commit '
f6496db8cefe68b2d02fde22a68b84f7b5c86686':
Additional checks for ModemActivityInfo.isValid()
Change-Id: Id4fb225d71e33bbfdf57dd13278fc71b4cd40370
Nathan Harold [Thu, 21 Apr 2016 02:09:26 +0000 (02:09 +0000)]
Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev
Hugo Benichi [Wed, 20 Apr 2016 03:09:33 +0000 (12:09 +0900)]
Some fixes in ConnectivityService event logging
Bug:
28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4
Phil Weaver [Thu, 21 Apr 2016 01:42:48 +0000 (01:42 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev
am:
4b88bddb12
* commit '
4b88bddb12a62ec2d791d45e5b995aab87666a7b':
Fix a11y key event handling from multiple devices.
Change-Id: I8da38100a98ab902033cfc290858a8da13c97ccd
Phil Weaver [Thu, 21 Apr 2016 01:38:47 +0000 (01:38 +0000)]
Merge "Fix a11y key event handling from multiple devices." into nyc-dev
Adrian Roos [Thu, 21 Apr 2016 01:36:18 +0000 (18:36 -0700)]
Remove obsolete TODO
Change-Id: Ia76b7f1cea0799c46ae5c933741c865869e39f5f
Fixes:
27550895
Jorim Jaggi [Thu, 21 Apr 2016 01:20:14 +0000 (01:20 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev
am:
54d056ed6d
* commit '
54d056ed6d75083ce166eb003fb93efc53cefea5':
Fix IME adjust in SysUI
Change-Id: I91ed0f07e9f39bbda4c88f1397707e29bfd75101
Christopher Tate [Thu, 21 Apr 2016 01:20:12 +0000 (01:20 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev
am:
157ae98762
* commit '
157ae987627ce93939c40dc6f1f3913b243973ae':
Only invoke k/v helpers during k/v operations
Change-Id: I5d44469ea4b888990109872493d0f5dfb61fd375
Jaewan Kim [Thu, 21 Apr 2016 01:20:10 +0000 (01:20 +0000)]
Merge "PIP: Support accessibility" into nyc-dev
am:
34a96e704e
* commit '
34a96e704e6bc12cc06d186ad7a344706a8afb5b':
PIP: Support accessibility
Change-Id: I1eb23bb5f0db795b9196a7d7e311126ba5cf7e39
TreeHugger Robot [Thu, 21 Apr 2016 01:17:55 +0000 (01:17 +0000)]
Merge "Fix IME adjust in SysUI" into nyc-dev
Chris Tate [Thu, 21 Apr 2016 01:12:06 +0000 (01:12 +0000)]
Merge "Only invoke k/v helpers during k/v operations" into nyc-dev
Jaewan Kim [Thu, 21 Apr 2016 01:11:38 +0000 (01:11 +0000)]
Merge "PIP: Support accessibility" into nyc-dev
Christopher Tate [Tue, 12 Apr 2016 19:36:47 +0000 (12:36 -0700)]
Only invoke k/v helpers during k/v operations
In particular, don't try to call the k/v wallpaper restore helper's
onRestoreFinished() if we are actually doing a full-data restore.
Bug
28132784
Change-Id: I2eaf748f6d54601f0ca195ae2781aa177daf0b93
Wale Ogunwale [Thu, 21 Apr 2016 01:06:13 +0000 (01:06 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev
am:
4d07c88919
* commit '
4d07c8891913a338d13ffe56133e24b0d167519f':
Exclude IME dialogs from tap outside task bounds funcationality
Change-Id: I5b02755cf0390c5ba0f7bbadebc1d4f0f52d117b
TreeHugger Robot [Thu, 21 Apr 2016 00:54:31 +0000 (00:54 +0000)]
Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev
Amith Yamasani [Thu, 21 Apr 2016 00:50:08 +0000 (00:50 +0000)]
Merge "Throw better exception when startVoiceActivity fails" into nyc-dev
am:
2be4c463bc
* commit '
2be4c463bc6411cf6fb9e2a4be0cbb90c485d0de':
Throw better exception when startVoiceActivity fails
Change-Id: I2666cf2bd09147e35a90ff21a45fc3a8944c49d8
Adam Lesinski [Thu, 21 Apr 2016 00:50:06 +0000 (00:50 +0000)]
Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
am:
c708cf6340
* commit '
c708cf6340e623202e562992e6ef4062ace84cab':
BatteryStatsHelper: Include screen on baseline power draw
Change-Id: I45d04bb852bf995b4f246fce3782dbeecafe24e4
Shreyas Basarge [Thu, 21 Apr 2016 00:50:04 +0000 (00:50 +0000)]
Merge "Fix logspam by JobInfo" into nyc-dev
am:
bb9dd3c9fd
* commit '
bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
Fix logspam by JobInfo
Change-Id: Icdb25bb608e89c280ee756d7dd4fadd03b25da15
TreeHugger Robot [Thu, 21 Apr 2016 00:46:30 +0000 (00:46 +0000)]
Merge "Throw better exception when startVoiceActivity fails" into nyc-dev
Adam Lesinski [Thu, 21 Apr 2016 00:39:57 +0000 (00:39 +0000)]
Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
Dianne Hackborn [Thu, 21 Apr 2016 00:39:41 +0000 (00:39 +0000)]
Merge "Fix logspam by JobInfo" into nyc-dev
Tim Murray [Thu, 21 Apr 2016 00:39:02 +0000 (00:39 +0000)]
Merge "Increase the max binder thread pool size for system_server." into nyc-dev
am:
150553756f
* commit '
150553756f89a51cc70b24cd9dbab4bdfba0fc59':
Increase the max binder thread pool size for system_server.
Change-Id: I40cab5fe8638276c2784a30f5099723faba2afce
Philip P. Moltmann [Thu, 21 Apr 2016 00:34:33 +0000 (00:34 +0000)]
Merge "Prevent printing from finishing activity." into nyc-dev
am:
41304f47f4
* commit '
41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
Prevent printing from finishing activity.
Change-Id: I4ab24c8ace1023c481244431bbac8cfbce4003a4
Adrian Roos [Thu, 21 Apr 2016 00:34:32 +0000 (00:34 +0000)]
Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev
am:
206748d10e
* commit '
206748d10e5f3b42e198af6a2e0801fb47ec3c01':
A11y: Fix battery icon and clock descriptions
Change-Id: I1d428b3c3f0d70ad275fb9d9bb1b39bcda8d3ac1
Tim Murray [Thu, 21 Apr 2016 00:32:45 +0000 (00:32 +0000)]
Merge "Increase the max binder thread pool size for system_server." into nyc-dev
Philip P. Moltmann [Thu, 21 Apr 2016 00:31:41 +0000 (00:31 +0000)]
Merge "Prevent printing from finishing activity." into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:25:14 +0000 (00:25 +0000)]
Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev
Philip P. Moltmann [Thu, 21 Apr 2016 00:23:28 +0000 (00:23 +0000)]
Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
am:
50a871857d
* commit '
50a871857d4a6c6f8d6ce8b3621414e60a32eaf6':
Print API for N: Fix docs and change interfaces as requested.
Change-Id: Ic913375a7d3e6d3fb664b2b046d9716e46511cc5
Jorim Jaggi [Thu, 21 Apr 2016 00:23:25 +0000 (00:23 +0000)]
Merge "Disallow changing stacks if top activity" into nyc-dev
am:
1fa356289e
* commit '
1fa356289e50d9a48d84afe831b230b087870e76':
Disallow changing stacks if top activity
Change-Id: I6248a6442513af45fb2d8da09853eed12dd1c30d
Ruchi Kandoi [Thu, 21 Apr 2016 00:20:09 +0000 (17:20 -0700)]
fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link
Change-Id: Ic12b98cbafcc8c81eadba119ab416a9eddb7214a
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Hugo Benichi [Tue, 19 Apr 2016 00:52:39 +0000 (09:52 +0900)]
Various fixes in IpReachability event logging
- fold IpReachabilityMonitor* classes into a single IpReachabilityEvent.
- only log an event for NUD_FAILED Netlink answers.
- distinguish between NUD_FAILED with or without lost of provisioning.
- do not record host ip addresses.
- record interface name instead of interface index when losing
provisioning.
- also return an error code when probeNeighbor fails, and log this error
code in IpReachability events.
Bug:
28204408
Change-Id: I5f0def0ab1ace7e467a0c69b3b82d07ef2252307
Philip P. Moltmann [Thu, 21 Apr 2016 00:17:46 +0000 (00:17 +0000)]
Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
TreeHugger Robot [Thu, 21 Apr 2016 00:11:49 +0000 (00:11 +0000)]
Merge "Disallow changing stacks if top activity" into nyc-dev
Vladislav Kaznacheev [Thu, 21 Apr 2016 00:11:28 +0000 (00:11 +0000)]
Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
am:
2860936
* commit '
28609360cfe25446ab5b0ba165af363378b3d805':
Add JavaDoc for View.updateDragShadow
Change-Id: I9aa23cafbeedf21e2cbca4e84adc0b424f7cfec0
Robert Carr [Thu, 21 Apr 2016 00:11:27 +0000 (00:11 +0000)]
Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
am:
abadeba
* commit '
abadeba99afbb1d80a38b396407822c96c7e3706':
Prevent recents from closing while moving PiP to fullscreen.
Change-Id: I97fa47524a1c78aa637fee4d6a086dec966698e7
Suprabh Shukla [Thu, 21 Apr 2016 00:03:13 +0000 (00:03 +0000)]
Merge "Removing disk access from startActivity thread" into nyc-dev
am:
6c0ead9
* commit '
6c0ead993e48f6e260972171b1187ef77b6094fb':
Removing disk access from startActivity thread
Change-Id: I7f62940ac1b51109f8804cc92c56dcd2b755340f
Eino-Ville Talvala [Thu, 21 Apr 2016 00:03:11 +0000 (00:03 +0000)]
Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
am:
5856779
* commit '
5856779c3a3e00e256cdf5cb571a85975d781cf4':
Camera2: Ignore exception on double-completed capture sequences.
Change-Id: Ie22c0bbdc83cba529bf521ebaef3349a5e22b976
TreeHugger Robot [Thu, 21 Apr 2016 00:02:06 +0000 (00:02 +0000)]
Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
Rob Carr [Thu, 21 Apr 2016 00:00:06 +0000 (00:00 +0000)]
Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 23:58:01 +0000 (23:58 +0000)]
Merge "Removing disk access from startActivity thread" into nyc-dev
Eino-Ville Talvala [Wed, 20 Apr 2016 23:55:09 +0000 (23:55 +0000)]
Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
Jorim Jaggi [Wed, 20 Apr 2016 23:42:06 +0000 (16:42 -0700)]
Fix IME adjust in SysUI
- Make sure scale is correct.
- Adjust interpolator to match WindowManager.
Bug:
28175599
Change-Id: Ica94b3dbac2fcc6e4b8a75faa311fb7861071ccc
Shreyas Basarge [Wed, 20 Apr 2016 23:44:58 +0000 (00:44 +0100)]
Fix logspam by JobInfo
Print interval clamp message
only for periodic jobs having
period/flex less than the minimum value.
Bug:
28296128
Change-Id: Id0d7c3b56048582a490bb8214eca491ec2bbdc93
Adrian Roos [Wed, 20 Apr 2016 23:44:54 +0000 (23:44 +0000)]
Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
am:
75fe7d5
* commit '
75fe7d5d791d8372af9d2e11a50287e6119a9780':
Fix inline reply clobbering when narrowly missing send button
Change-Id: I61f9303383937030750edd95eee11862b59e8447
TreeHugger Robot [Wed, 20 Apr 2016 23:39:50 +0000 (23:39 +0000)]
Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
Wale Ogunwale [Wed, 20 Apr 2016 23:33:36 +0000 (16:33 -0700)]
Exclude IME dialogs from tap outside task bounds funcationality
We don't want tapping on these windows to cause a change in app
focus.
Bug:
28184155
Change-Id: Ibd4ca15b2154c2e83a11f4a2a3edb4356cbfbfed
Felipe Leme [Wed, 20 Apr 2016 23:33:28 +0000 (23:33 +0000)]
Merge "Set BugreportProgressService to run on foreground." into nyc-dev
am:
3053c3f
* commit '
3053c3f2a94b24ceeed9c46cb84045c285d3523b':
Set BugreportProgressService to run on foreground.
Change-Id: Ib5b92dfcaf3dca5710abc19f261fed8017fcae1f
TreeHugger Robot [Wed, 20 Apr 2016 23:23:10 +0000 (23:23 +0000)]
Merge "Set BugreportProgressService to run on foreground." into nyc-dev
Adam Lesinski [Wed, 20 Apr 2016 22:56:11 +0000 (22:56 +0000)]
Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
am:
1362ae0
* commit '
1362ae062a196c8450a0b649dd0c5af66d1f05a1':
ResourcesManager: Throw exception if failed to load asset path
Change-Id: I01276ec237130b9d49bc46a9e2b7b29e08aa5922
Adrian Roos [Wed, 20 Apr 2016 22:51:42 +0000 (15:51 -0700)]
A11y: Fix battery icon and clock descriptions
Now announces charging state on the battery icon
and AM/PM on the clock.
Change-Id: Ib8d249e60b555834e5e224287ea332178ce7c165
Fixes:
27552350
Adam Lesinski [Wed, 20 Apr 2016 22:46:04 +0000 (22:46 +0000)]
Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
Jorim Jaggi [Wed, 20 Apr 2016 03:30:47 +0000 (20:30 -0700)]
Disallow changing stacks if top activity
When we attach an activity to an existing
task, and that task is already on top,
disallow changing stacks altogether even
if launch stack id is set.
Bug:
28026847
Change-Id: Ie70f0585a29dc1b85a5093624fede32110be3c76
Lifu Tang [Wed, 20 Apr 2016 22:30:53 +0000 (22:30 +0000)]
Merge "Added defensive code to prevent system crash" into nyc-dev
am:
a381455
* commit '
a381455472a814c8dbd98fcb4312f46ed1373c88':
Added defensive code to prevent system crash
Change-Id: I7a48940b04b3033ab2c5e0f370098749e4fdd8fd
Lifu Tang [Wed, 20 Apr 2016 22:30:52 +0000 (22:30 +0000)]
Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
am:
e1b5171
* commit '
e1b51715bdd1d59913ef4cb83071ef8eaac968de':
Fixed bug in upgrading GpsMeasurement
Change-Id: I89d094509612073a7e7e046db48f896a653d42a9
Suprabh Shukla [Wed, 20 Apr 2016 22:24:31 +0000 (15:24 -0700)]
Removing disk access from startActivity thread
Code was checking whether the directory for recent_images existed in
many places unnecessarily causing StrictMode violations. Moved the
code to only attempt to check and create the directory before
actually writing to disk.
Bug: b/
28195831
Change-Id: I05f77a10f1dafc8cc0b1836b62352d56549ac1ee
Lifu Tang [Wed, 20 Apr 2016 22:19:17 +0000 (22:19 +0000)]
Merge "Added defensive code to prevent system crash" into nyc-dev
Lifu Tang [Wed, 20 Apr 2016 22:19:04 +0000 (22:19 +0000)]
Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
Christopher Tate [Wed, 20 Apr 2016 22:13:08 +0000 (22:13 +0000)]
Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev
am:
665189f
* commit '
665189f92646d34bf02082120cba3c62aa718770':
Don't back up wallpapers that we've been told not to
Change-Id: I60eb02a9b1ab8da966d964c62a6dccf52d873e94
Christopher Tate [Wed, 20 Apr 2016 22:13:07 +0000 (22:13 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713 am:
8c635e7 am:
343600c am:
b965ced -s ours
am:
129c01a
* commit '
129c01af82df8560f9db9c990651e54689e55274':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I52a5a34af6acb17d63ae43ac999609de6994be88
OSDN Git Service
