Commit Graph

52986 Commits

Author SHA1 Message Date
Seigo Nonaka
e95ce0fdb7 Merge "Dump mSupportsSwitchingToNextInputMethod value" 2015-10-14 17:38:43 +00:00
Doris Liu
d1bf9f0054 Merge "New public API for calculating the total duration of an animation" 2015-10-14 17:18:37 +00:00
Seigo Nonaka
d742bfda06 Dump mSupportsSwitchingToNextInputMethod value
Bug: 24280547
Change-Id: Ibfdf09a0a2b3e907ae3e900ee541437725650463
2015-10-14 19:52:32 +09:00
Dianne Hackborn
c890c56085 am a7036ce1: am 05222c34: am 829920ed: am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
* commit 'a7036ce15a4a540fd556e220a89feffb3b88b11a':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
2015-10-13 01:59:54 +00:00
Alan Viverette
0cfe7638a3 am bbd8315d: am ff953294: am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit 'bbd8315daa82f9761c21d72ed22a3f001c28a6ca':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
2015-10-13 01:59:02 +00:00
Wale Ogunwale
5247523c90 Merge "Don't set incorrect stack bounds when rotating screen in docked mode" 2015-10-13 01:58:05 +00:00
Wale Ogunwale
ffc11bb712 Don't set incorrect stack bounds when rotating screen in docked mode
Both window manager and activity manager could decide what the bounds
of other stacks should be when the docked stack exist which can get
out of sync. Now window manager does the bounds calculation and
activity manager asks window manager what the bounds should be when
it needs to resize the stack.

Bug: 24738105
Change-Id: I97356f008b676d2f58a8b54fdb08735ab51394af
2015-10-12 18:56:28 -07:00
Doris Liu
8b7c99cca2 New public API for calculating the total duration of an animation
Total duration is the total amount of time an animation takes from
start to finish. It include start delay (if any), child animation
sequence, accounting for repeat.

Change-Id: Id5b36a63c02e25586aefd38612aa5867492e1adb
2015-10-12 18:24:40 -07:00
Jeff Sharkey
75f4786606 resolved conflicts for f20a5700 to master
Change-Id: I1f13a63c3680901fac58ef709118c9242032b11f
2015-10-12 17:51:45 -07:00
Dianne Hackborn
f86aed1ed3 Merge "resolved conflicts for 8cbd7c8a to master" 2015-10-13 00:23:25 +00:00
Dianne Hackborn
a7036ce15a am 05222c34: am 829920ed: am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
* commit '05222c3440d1ba207fe6f87037a8297f33f3318a':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
2015-10-13 00:20:42 +00:00
Alan Viverette
bbd8315daa am ff953294: am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit 'ff9532940084a89b4cfe89bc954e7d8af1c695f0':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
2015-10-13 00:19:30 +00:00
Doris Liu
c73c7db91d Merge "More refactor on ValueAnimator" 2015-10-13 00:16:46 +00:00
Dianne Hackborn
30a4e6d514 resolved conflicts for 8cbd7c8a to master
Change-Id: I54dd1dbf2fd93c474e79d3d7be1b0bb57aff9ab7
2015-10-12 17:14:56 -07:00
Dianne Hackborn
829920ede0 am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
* commit '34c120dc6142c861cb131c900cdee3c19f81ce51':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
2015-10-12 23:00:20 +00:00
Dianne Hackborn
b02ce29144 "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
...due to lack of permissions

Still doesn't, but an alternative is now offered.

Change-Id: I7b9da709c96ed7790c70d686c30c7855f3979778
2015-10-12 15:14:16 -07:00
Dianne Hackborn
d019d4ab3f Merge "Add new "shell command" feature to Binder objects." 2015-10-12 21:41:39 +00:00
Chong Zhang
3425909285 Merge "Fix missing frame or wrong frame position when resize starts" 2015-10-12 20:47:38 +00:00
Alan Viverette
d9635e60f0 am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit 'c83a6121d214631c0a52be5b2c5c8ce2f6470ed0':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
2015-10-12 19:46:31 +00:00
Alan Viverette
c83a6121d2 Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev 2015-10-12 19:41:10 +00:00
Filip Gruszczynski
db5dec271e Improve relaunch merging in activity thread.
To reduce the number of times that we load resources based on
configuration changes ActivityThread employs an optimization
strategy that merges relaunch operations. If it receives a
relaunch request why one is already queued, it will just update
the queued request instead of creating a new one. Unfortunately
this breaks the guarantee of executing lifecycle events in the
order they were received.

Consider following scenario of requestes from Activity Manager:
1) relaunch the activity in not resumed state;
2) resume the activity;
3) relaunch the activity in resumed state.

The Activity Thread can process these commands in following order:
1) receive the request to relaunch in not resumed state;
2) receive the request to resume the activity;
3) receive the request to resumed state, update the exisiting
request;
4) execute the request to relaunch in resume state;
5) execute the request to resume.

This causes the activity to perform resume twice.

Since we need the merging of relaunch operations for performance
reasons, we need to introduce a secondary mechanism for ordering
of lifecycle requests. Relaunching, pausing, stopping and resuming
receive a sequence number based on when the request was received. If
the last executed sequence number is higher then the operations
sequence number then the operation will be dropped.

In the above scenario the sequence number would be:
1) request to relaunch not resumed receives seq + 0;
2) request to resume receives seq + 1;
3) request to relaunch resumed receives seq + 2;
4) execution of of request to relaunch resumed set current sequence
number to seq + 2;
5) since seq + 1 < seq + 2, then the execution of request to resume
is prevented.

Bug: 24806374

Change-Id: Ia520dd1aa215827d4172a9891a7cc01db2ce627e
2015-10-12 12:00:38 -07:00
Chong Zhang
8dbd9ad682 Fix missing frame or wrong frame position when resize starts
When multi-thread renderer is used, delay the report to draw to the
first doFrame in ResizeFrameThread. Otherwise we could unfreeze the
window before the frame is drawn.

Also when content draw bounds is updated for the first frame, let
content draw before ResizeFrameThread so that the bounds get applied.

bug: 24715185

Change-Id: I5485dc0be3eae24c555bcc31ee8f71523b68ca8d
2015-10-12 11:01:14 -07:00
Dianne Hackborn
9461b6f91f Add new "shell command" feature to Binder objects.
IBinder has a new common interface for sending shell commands
to it.  This can be implemented by system services to provide
a shell interface to the service, without needing to have separate
shell java code.

This includes changes to DeviceIdleController to implement the
shell interface for all of the commands it has been providing
through dumpsys.

Change-Id: I76518ea6719d1d08a8ad8722a059c7f5fd86813a
2015-10-12 10:38:41 -07:00
Jeff Sharkey
f20a5700a4 am 75051c3a: am 7f6d8754: am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit '75051c3a62123b4668231d0243ba11462e02ac5a':
  Push firewall rules up to ConnectivityService.
2015-10-12 16:55:58 +00:00
Jeff Sharkey
8cbd7c8a8a am 8feaed95: am da5d9af8: am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit '8feaed95cfc79cc96a0c0a18c3db8154dd9f551a':
  Default location is "internalOnly" when undefined.
2015-10-12 16:55:52 +00:00
Jeff Sharkey
7f6d8754e6 am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit 'a03ecf7d7c8ff2844caf5feecc6d29f1f7346ff9':
  Push firewall rules up to ConnectivityService.
2015-10-12 16:39:34 +00:00
Jeff Sharkey
da5d9af805 am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev
* commit 'fe45f1b97a1f572ce453193035f1fabf7957cc03':
  Default location is "internalOnly" when undefined.
2015-10-12 16:39:29 +00:00
Jeff Sharkey
a03ecf7d7c Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev 2015-10-12 16:34:19 +00:00
Jeff Sharkey
fe45f1b97a Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev 2015-10-12 16:34:03 +00:00
Lorenzo Colitti
068da68200 am 553a934c: am 647ec7f8: am 4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '553a934c47ec255b84647fa8e603bd4edf8fd7cd':
  Connect the DHCP UDP socket to the server.
2015-10-11 14:20:04 +00:00
Lorenzo Colitti
647ec7f80e am 4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '4e4d59eeef86fa8560d35c00168869b0a066f962':
  Connect the DHCP UDP socket to the server.
2015-10-11 13:43:34 +00:00
Lorenzo Colitti
4e4d59eeef Connect the DHCP UDP socket to the server.
This makes it so that the socket cannot receive datagrams from
anybody except the DHCP server. This does not improve security,
because we never read from the UDP socket anyway, but it does
make ListeningPortsTest pass.

Bug: 23906864
Bug: 23933386
Change-Id: Ib090273a417f7eb2ac1ee3309260249b72fb8345
2015-10-11 16:06:11 +09:00
Jeff Sharkey
c88a2d5b33 Default location is "internalOnly" when undefined.
When an app doesn't define installLocation, the default behavior
should be to treat it as internal only.  This matches all the
published developer documentation.

Without this, apps could be unwittingly be moved to adopted storage
devices.

Bug: 24771264
Change-Id: Iaf38ab45329aad6cb5d6deac81fb1781f680189b
2015-10-09 13:22:09 -07:00
Anthony Hugh
9b907ce5d8 am 66940eaa: am 073a1624: am 6b566ec5: Merge "Give Android Wear system apps default permission" into cw-e-dev
* commit '66940eaaabc007d839d17c71b21c914a1bbba2e0':
  Give Android Wear system apps default permission
2015-10-09 18:50:23 +00:00
Anthony Hugh
66940eaaab am 073a1624: am 6b566ec5: Merge "Give Android Wear system apps default permission" into cw-e-dev
* commit '073a1624912a93da65b5e40b6ff434c4fd3ab0f2':
  Give Android Wear system apps default permission
2015-10-09 18:36:42 +00:00
Anthony Hugh
6b566ec5fd Merge "Give Android Wear system apps default permission" into cw-e-dev 2015-10-09 18:26:56 +00:00
John Reck
3ebdc0c3b5 Merge "Super-fast getLineWidth for BL" 2015-10-09 14:16:04 +00:00
Mahaver Chopra
76b08a9d17 Documentation of EXTRA_PROVISIONING_WIFI_SECURITY_TYPE
Valid values for EXTRA_PROVISIONING_WIFI_SECURITY_TYPE in the documentation

Bug: 23379302
Change-Id: I039432d81de6834c01bbe6ca0fc668afec38d040
2015-10-09 12:32:31 +01:00
Lorenzo Colitti
cccaa51f34 Merge "Connect the DHCP UDP socket to the server." 2015-10-09 04:36:02 +00:00
Lorenzo Colitti
577255e1d4 Connect the DHCP UDP socket to the server.
This makes it so that the socket cannot receive datagrams from
anybody except the DHCP server. This does not improve security,
because we never read from the UDP socket anyway, but it does
make ListeningPortsTest pass.

Bug: 23906864
Bug: 23933386
Change-Id: I82fe9d6c6c520536ffd6422bcc60fab664999e6f
2015-10-09 13:27:22 +09:00
Lorenzo Colitti
69eedb4de0 Merge "Add a null check to hasIPv4AddressOnInterface." 2015-10-09 04:04:27 +00:00
Lorenzo Colitti
89b6392046 Add a null check to hasIPv4AddressOnInterface.
Change-Id: Ie38505ec0a93f4060348d92db341c536b7d60ed0
2015-10-09 12:36:30 +09:00
Doris Liu
fbe94ece70 More refactor on ValueAnimator
mPlayingBackwards is confusing when placed next to mReversing.
One means the overall direction of animation playing, the other
indicates the direction of playing in the current iteration.

mCurrentIteration and mPlayingBackward are redundant together,
as the latter can be derived from the former, given the overall
direction of animation playing. Redundant variables pose risk of
getting out of sync and therefore are refactored out in this CL.
Instead, an overall fraction that ranges from 0 to mRepeatCount + 1
was introduced. It can capture both the current iteration and the
fraction in the current iteration. It gives a much better idea of
the overall progress of the animation.

Change-Id: Ic0ea02c86b04cfc01c462687d1ebbd46184cbab7
2015-10-08 18:40:05 -07:00
Anthony Hugh
979b81ac33 Give Android Wear system apps default permission
This change grants Android Wear system components default
permission.

I have also added a new Intent category to help identify
the main Home handler on Wear.

BUG: 23419042
Change-Id: Ie669a9908bd3b03498f75c5ca22c0fddf52a5203
2015-10-08 16:34:28 -07:00
Wale Ogunwale
6efc461966 Merge "Added rules for status/nav bar customization when in multi-window mode" 2015-10-08 23:04:23 +00:00
Julia Reynolds
8b14288c94 Merge "Remove rename automatic zen rule." 2015-10-08 22:27:10 +00:00
Hui Shu
fb78ae50b5 Merge "Format the Javadoc using <p>" 2015-10-08 22:23:03 +00:00
Chet Haase
416ee42556 Merge "Fix ValueAnimator.getCurrentPlayTime()" 2015-10-08 21:07:30 +00:00
Alan Viverette
1aba36d721 Merge "Revert "Reduce CascadingMenuPopup's reliance on internal ListView state"" 2015-10-08 19:54:49 +00:00
Alan Viverette
2ac975deb3 Revert "Reduce CascadingMenuPopup's reliance on internal ListView state"
Introduced some regressions. Reverting until we can do better testing.

This reverts commit 8375d63998.

Change-Id: I9b15d63e52c814ef8985b86f8a50359e39355d39
2015-10-08 19:54:16 +00:00