219297 Commits

Author SHA1 Message Date
Adam Lesinski
45f704a4d0 am 89eaa06a: am 6382a950: am 2327239d: Merge "Handle \'root\' pseudo-package in the appops command"
* commit '89eaa06a10ed399ae9919de2795f76c2af932adc':
  Handle 'root' pseudo-package in the appops command
2015-10-13 01:24:29 +00:00
Adam Lesinski
4ffea4e4da am d0c806b1: am 6029dfa8: am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"
* commit 'd0c806b10c8e45dcfa950adc36742b15edababea':
  Make 'idmap --scan' accept more than one input directory
2015-10-13 01:24:16 +00:00
Jeff Sharkey
92d2fae09b Merge "Maybe we can build?" 2015-10-13 01:08:37 +00:00
Jeff Sharkey
7c3e442651 Maybe we can build?
Change-Id: Id0ea9da94f8672cc18430903cd8e9c8a6b8ef8e7
2015-10-12 18:07:38 -07:00
Miao Wang
474429e420 am d3330b88: am 41333316: am 46811dd9: am c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
* commit 'd3330b8862422c5ed1ca093e050080c2f61bf474':
  [RenderScript] pass correct length of ains to BLAS functions
2015-10-13 00:55:32 +00:00
Jeff Sharkey
9d77be8383 am d2c95f98: am 97604b42: am 9f1ae4dc: am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev
* commit 'd2c95f9821c98604ab06fb3d7c6f617bd88ada3e':
  Fix parole scheduling bugs.
2015-10-13 00:55:17 +00: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
Doris Liu
68dcb30c27 Add more tests for seeking and reversing
Change-Id: I00fc4a9655760dea29ecca3f02d19c636cea28f7
2015-10-13 00:20:36 +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
Steve McKay
260c6980ce Treat UNKNOWN tooltype events as Mouse events.
Temporary fix for CTS.
Eventually we'll need to update UiAutomator to support specific input tooltypes.

Bug: 24544391
Change-Id: Ief339d0d35c4305811928e9605b535c7ef230f7b
2015-10-12 16:24:07 -07:00
Rob Carr
130c34bfa6 Merge "Ensure recent documents are trimmed when relaunching." 2015-10-12 23:17:31 +00:00
John Reck
8b6c79f5fc Merge "Microbench hackery" 2015-10-12 22:56:32 +00:00
John Reck
4a4bc892e8 Microbench hackery
Change-Id: I35428350e16982824bb4e8a0015a4cb98b1c0799
2015-10-12 15:45:01 -07:00
Dianne Hackborn
d019d4ab3f Merge "Add new "shell command" feature to Binder objects." 2015-10-12 21:41:39 +00:00
Robert Carr
d26e079df1 Ensure recent documents are trimmed when relaunching.
With respect to recents trimming, documents excercise a
a special code path, where the number of open documents
is compared to a configured max documents. In fact though
if we have mandated a trim (regardless of recents size)
we don't care about this max documents number.

Bug: 24717461
Change-Id: I2ffb4a037307d666ea0a7f31d75638b64b6eab8e
2015-10-12 14:06:34 -07:00
Chong Zhang
3425909285 Merge "Fix missing frame or wrong frame position when resize starts" 2015-10-12 20:47:38 +00:00
Jason Monk
c7e19d9f14 Merge "Quick prototype of new header" 2015-10-12 20:16:41 +00:00
Jason Monk
c34befb319 Quick prototype of new header
- Has first 4 quick tiles shown in collapsed mode
 - Shows date + settings gear in expanded mode
 - Still has a few gaps (alarms probably don't work)
 - Fix issue with placement of cell data type indicator

Change-Id: I629798b96f4f088fde47c7b67feea304dcc8450c
2015-10-12 16:15:26 -04:00
Adam Lesinski
89eaa06a10 am 6382a950: am 2327239d: Merge "Handle \'root\' pseudo-package in the appops command"
* commit '6382a950cdd651070bcdedd5f89e6fc78e2b0450':
  Handle 'root' pseudo-package in the appops command
2015-10-12 19:40:06 +00:00
Adam Lesinski
6382a950cd am 2327239d: Merge "Handle \'root\' pseudo-package in the appops command"
* commit '2327239d65525d8ba2bdbedd6e59809fef447a12':
  Handle 'root' pseudo-package in the appops command
2015-10-12 19:34:28 +00:00
Adam Lesinski
2327239d65 Merge "Handle 'root' pseudo-package in the appops command" 2015-10-12 19:29:14 +00:00
Chong Zhang
25ad8e7ea3 Merge "Fix bogus warning in startResizingTask" 2015-10-12 19:19:51 +00:00
Denis Kuznetsov
dbb478dc7a Merge "Fix Notification settings upon installation after Restore." 2015-10-12 19:18:18 +00:00
Adam Lesinski
d0c806b10c am 6029dfa8: am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"
* commit '6029dfa81a01ab41318a8e9601448387179f8703':
  Make 'idmap --scan' accept more than one input directory
2015-10-12 19:06:43 +00:00
Filip Gruszczynski
094948641b Merge "Improve relaunch merging in activity thread." 2015-10-12 19:04:47 +00:00
Chong Zhang
fe98b064bc Fix bogus warning in startResizingTask
win will be null if no window is found for resizing which is normal.

bug: 24814867
Change-Id: I16fc55af62b8f90643a3e85ca6d741db92fae958
2015-10-12 12:04:02 -07: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
Adam Lesinski
6029dfa81a am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"
* commit '7caa8f14a78d279e0392089dca2f54f27e7f5d15':
  Make 'idmap --scan' accept more than one input directory
2015-10-12 18:59:03 +00:00
Adam Lesinski
7caa8f14a7 Merge "Make 'idmap --scan' accept more than one input directory" 2015-10-12 18:53:25 +00:00
Jeff Sharkey
1da9e733d1 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-10-12 18:39:17 +00:00
Winson Chung
3f669082aa Merge "Allowing multiple preferred drag regions for tablets." 2015-10-12 18:38:59 +00:00
Vinu Deokaran
98a6fd733c am 18b60e61: am f6747190: am 04166953: am 6be61a98: wm: call displayReady for all built in displays when system is ready.
* commit '18b60e612f45fd7f8c57ae397a325a8eb7eec20f':
  wm: call displayReady for all built in displays when system is ready.
2015-10-12 18:38:50 +00:00
Winson
882072baac Allowing multiple preferred drag regions for tablets.
Change-Id: I514e501d185f4139ce21798fc92bc931626c8239
2015-10-12 11:26:33 -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
Wale Ogunwale
446433da24 am 4b6a829a: am 83a39080: am 1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."
* commit '4b6a829ac2c7af671f131a738437f1e393b13ec6':
  Fix resumeHomeStackTask can't resume home if activity is finishing.
2015-10-12 17:13:47 +00:00
Geoff Mendal
b4c0ad9775 am 94127464: (-s ours) am 99ec3595: (-s ours) am ef2f6596: (-s ours) am ac3b53a7: (-s ours) Import translations. DO NOT MERGE
* commit '94127464b460b65ca6689e1c5156789decca8488':
  Import translations. DO NOT MERGE
2015-10-12 17:13:36 +00:00
Pirama Arumuga Nainar
de5fe60afb am e1ffb406: am 05f0dc28: am d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation."
* commit 'e1ffb406edd5f7bc224669a2f544fad26aff1d31':
  Fix punctuation and typos in AllocationAdapter's documentation.
2015-10-12 17:13:00 +00:00
Lorenzo Colitti
6bb16f4291 am 068da682: am 553a934c: am 647ec7f8: am 4e4d59ee: Connect the DHCP UDP socket to the server.
* commit '068da68200ce5551f1a77ac1e83a3c5157c35701':
  Connect the DHCP UDP socket to the server.
2015-10-12 17:12:19 +00:00
Lorenzo Colitti
eda0ea4190 am 3d3f766c: am 871d96b4: am 13c5dd5c: am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev
* commit '3d3f766c8b37dcf495235ca4a500494498712eed':
  Support DHCP replies with multiple default gateways.
  Accept DHCP responses from non-67 server source ports
  Improve logging of DHCP parse errors using exceptions.
2015-10-12 17:12:08 +00:00
Miao Wang
d3330b8862 am 41333316: am 46811dd9: am c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
* commit '41333316d7aead817295d163618da7931200534b':
  [RenderScript] pass correct length of ains to BLAS functions
2015-10-12 17:04:11 +00:00
Miao Wang
41333316d7 am 46811dd9: am c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
* commit '46811dd9df0cbef68f69e938a52b418ba927882a':
  [RenderScript] pass correct length of ains to BLAS functions
2015-10-12 16:57:15 +00:00
Jeff Sharkey
d2c95f9821 am 97604b42: am 9f1ae4dc: am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev
* commit '97604b42d997e0c577d33c21f7a48ef1a73185ab':
  Fix parole scheduling bugs.
2015-10-12 16:56:03 +00: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
Miao Wang
46811dd9df am c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev
* commit 'c4c42d55f0c1a4130da7e8f70a2338a4282b3ae5':
  [RenderScript] pass correct length of ains to BLAS functions
2015-10-12 16:52:34 +00:00
Jeff Sharkey
97604b42d9 am 9f1ae4dc: am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev
* commit '9f1ae4dc260d099834d386cf1d0074ff54b3f50f':
  Fix parole scheduling bugs.
2015-10-12 16:49:05 +00:00
Jeff Sharkey
75051c3a62 am 7f6d8754: am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev
* commit '7f6d8754e6d509bf17fe0c46130c884b16706b12':
  Push firewall rules up to ConnectivityService.
2015-10-12 16:48:59 +00:00