Commit Graph

65298 Commits

Author SHA1 Message Date
TreeHugger Robot
6cd5d2f838 Merge "Adding orientation preserving resizing" 2016-12-08 06:05:28 +00:00
skuhne@google.com
322347ba58 Adding orientation preserving resizing
Adding freeform resizing to activities which require
a certain orientation. This is needed for e.g. ARC++.

Bug: 33267688
Test: runtest frameworks-services -c com.android.server.wm.TaskPositionerTests
Test: Visually on ARC++
Change-Id: If708c1602cb2ff464174389af4648ad767b0b079
2016-12-07 20:01:19 -08:00
Joe Onorato
be5378574b Merge changes from topic 'proto convenience methods'
* changes:
  ProtoOutputStream convenience methods.
  Give protoc-gen-javastream the ability to output multiple java files.
2016-12-08 02:39:50 +00:00
TreeHugger Robot
5683204632 Merge "Camera2: Consolidate the overriding of PRIVATE format" 2016-12-08 02:34:08 +00:00
TreeHugger Robot
a62415dd1e Merge "Only persist last Shared Preferences state" 2016-12-08 02:23:37 +00:00
TreeHugger Robot
66ebaf7ff5 Merge "Fix vulnerability in MemoryIntArray" 2016-12-08 01:39:52 +00:00
Shuzhen Wang
71e6d62d23 Camera2: Consolidate the overriding of PRIVATE format
We had overriding of PRIVATE format scattered at multiple places.
Consolidate them into one place.

Test: Camera preview/capture, and camcorder recording
Change-Id: I098ce93bba2000760a20c0297fcf0cb9d8c6caab
2016-12-07 16:22:37 -08:00
Stephen Chen
4aef203cb8 Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." am: faf3aa697f am: fe9a20c980 am: 609711bbd5
am: 357483f41e

Change-Id: I4cb930396651b86d9a786b9b0abe807c300cd526
2016-12-07 23:33:49 +00:00
Stephen Chen
357483f41e Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." am: faf3aa697f am: fe9a20c980
am: 609711bbd5

Change-Id: I11634693f1088319c90e291d78edbc8e10cd147a
2016-12-07 23:25:46 +00:00
Stephen Chen
609711bbd5 Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." am: faf3aa697f
am: fe9a20c980

Change-Id: I7bba392e349525dd55bb8b251554e81967424136
2016-12-07 23:18:15 +00:00
Treehugger Robot
faf3aa697f Merge "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED." 2016-12-07 23:00:26 +00:00
Svetoslav Ganov
74c9983e80 Fix vulnerability in MemoryIntArray
MemoryIntArray was using the size of the undelying
ashmem region to mmap the data but the ashmem size
can be changed until the former is memory mapped.
Since we use the ashmem region size for boundary
checking and memory unmapping if it does not match
the size used while mapping an attacker can force
the system to unmap memory or to access undefined
memory and crash.

Also we were passing the memory address where the
ashmem region is mapped in the owner process to
support cases where the client can pass back the
MemoryIntArray instance. This allows an attacker
to put invalid address and cause arbitrary memory
to be freed.

Now we no longer support passing back the instance
to the owner process (the passed back instance is
read only), so no need to pass the memory adress
of the owner's mapping, thus not allowing freeing
arbitrary memory.

Further, we now check the memory mapped size against
the size of the underlying ashmem region after we do
the memory mapping (to fix the ahsmem size) and if
an attacker changed the size under us we throw.

Tests: Updated the tests and they pass.

bug:33039926
bug:33042690

Change-Id: Ib8e50afcdb5475123968572ac9696e8ed4031631
2016-12-07 22:43:56 +00:00
TreeHugger Robot
e5e0a85ef3 Merge "Fix slow exit transition left exited views INVISIBLE." 2016-12-07 22:22:48 +00:00
Joe Onorato
fb9f736a3c ProtoOutputStream convenience methods.
- Add a set of write methods to ProtoOutputStream that figure out the type.
  The other methods are doing all the type checking anyway, so this won't be
  much slower, and it's way easier to use.  The expected java type casts
  that people would do anyway happen inside.
- Add writeObject and writeRepeatedObject methods that write a pre-encoded
  object.
- Add a constructor that takes an OutputStream, and a flush() method.  Right
  now, all the data gets flushed at the end, but given this API it would be
  possible to write smaller chunks at the object boundaries and do more
  sophisticated buffering.

Test: CTS
Change-Id: Ieb852092d3d65812c81139558151de9e3f467dc8
2016-12-07 13:24:54 -08:00
Matthew Fritze
13b50bde4b Merge "Update SearchIndexablesContract" 2016-12-07 19:37:43 +00:00
Sunny Goyal
1d138e5919 Preventing widgets from exceeding Bitmap memory limit
am: 4f05d8d76b

Change-Id: I0174a7e8cc8b228d7cbf2c0403f0a022eff34194
2016-12-07 19:20:02 +00:00
Jeff Sharkey
1804995d7e Fix two StrictMode stack collection bugs.
am: 20db11cfda

Change-Id: Ie68764c9864e1c26f43c9d70c5697fe12d00e665
2016-12-07 18:44:28 +00:00
Philip P. Moltmann
c543b56706 Only persist last Shared Preferences state
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.

For commit() we need to make sure that we have at least persisted the
state of the commit.

Generation counts are 64 bit, hence they never overflow.

Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
2016-12-07 10:33:21 -08:00
Mark Renouf
cb566f368b Revert "Allow power button to close an input method" am: 28f0e5bf48
am: fc526f6e84

Change-Id: Ifcf2f842c91677128e458dd7256013263543937f
2016-12-07 17:38:13 +00:00
Mark Renouf
fc526f6e84 Revert "Allow power button to close an input method"
am: 28f0e5bf48

Change-Id: I678857531259617cc26941fcc832cb7670d25bfe
2016-12-07 17:29:25 +00:00
Matthew Fritze
af534b111c Update SearchIndexablesContract
Add Payload and PayloadType to the SearhIndexablesContract to support
the new Search architecture in Settings Search.

Change-Id: I07e411ead11d420c19c737fad79d459f44288681
Test: SettingsUnitTests
Bug: 33390556
2016-12-07 17:24:30 +00:00
Jeff Sharkey
20db11cfda Fix two StrictMode stack collection bugs.
When Binder calls are nested, we can quickly end up with a snowball
of stacktraces that can cause the original transaction to fail.  This
CL makes two specific changes to alleviate this pressure:

-- Consider a nested Binder call from PID A -> B -> C.  If both B and
C encounter dozens of StrictMode violations, then gatheredViolations
in B will end up with 10 ViolationInfo (5 from B and 5 from C).  This
problem only grows with each successive nested call.  To solve this,
always limit ourselves to only ever write out 3 ViolationInfo from
any given process.

-- CrashInfo already nicely truncates any large stack traces to 20kB,
but readAndHandleBinderCallViolations() blindly appends the entire
local trace, and never considers truncating again.  Similar to the
first problem above, nested calls can quickly cause the stackTrace
value to explode in size.  To solve this, we always re-truncate the
stackTrace value after appending our local stack.

Also fix some NPE bugs when missing crashInfo.

(cherry-picked from commit 58f27b5033)

Test: builds, boots
Bug: 32575987
Change-Id: Ie8373ca277296f920f2b1c564d419c702a8ee0f2
2016-12-07 08:58:38 -08:00
Wale Ogunwale
929a81b81d Merge "Revert "Correct error in Configuration.updateFrom"" 2016-12-07 16:09:10 +00:00
Wale Ogunwale
64145dcbeb Revert "Correct error in Configuration.updateFrom"
Change is preventing the device from showing the lock screen
after the boot animation.

This reverts commit 4647acb60e.

Bug: 33098677
Change-Id: If7ecb04b74d5b626c7c3517e7e8d1dc1566ccb17
2016-12-07 16:00:53 +00:00
TreeHugger Robot
9751197d30 Merge "Fix javadoc of EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION" 2016-12-07 14:29:28 +00:00
Erik Kline
7549504970 Merge "Handle IpReachabilityMonitor errors better." am: 3af34c8e0a
am: 4467b79592

Change-Id: I5d4d2d9888d85a684425b8204785099f818e6546
2016-12-07 09:30:09 +00:00
TreeHugger Robot
82ddb5e118 Merge "Fix two StrictMode stack collection bugs." 2016-12-07 08:21:42 +00:00
Erik Kline
b406666cf5 Handle IpReachabilityMonitor errors better.
If construction of a new IpReachabilityMonitor throws an IAE then
log it and immediately call onProvisioningFailure().

Test: runtest frameworks-wifi
      passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()
      which fails with an NPE for unrelated reasons.

Bug: 31038971
Bug: 31742703
Change-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c
(cherry picked from commit e452660466)
2016-12-07 16:23:26 +09:00
Jeff Sharkey
58f27b5033 Fix two StrictMode stack collection bugs.
When Binder calls are nested, we can quickly end up with a snowball
of stacktraces that can cause the original transaction to fail.  This
CL makes two specific changes to alleviate this pressure:

-- Consider a nested Binder call from PID A -> B -> C.  If both B and
C encounter dozens of StrictMode violations, then gatheredViolations
in B will end up with 10 ViolationInfo (5 from B and 5 from C).  This
problem only grows with each successive nested call.  To solve this,
always limit ourselves to only ever write out 3 ViolationInfo from
any given process.

-- CrashInfo already nicely truncates any large stack traces to 20kB,
but readAndHandleBinderCallViolations() blindly appends the entire
local trace, and never considers truncating again.  Similar to the
first problem above, nested calls can quickly cause the stackTrace
value to explode in size.  To solve this, we always re-truncate the
stackTrace value after appending our local stack.

Also fix some NPE bugs when missing crashInfo.

Test: builds, boots
Bug: 32575987
Change-Id: Ie8373ca277296f920f2b1c564d419c702a8ee0f2
2016-12-07 06:31:50 +00:00
Tomasz Mikolajewski
6c686c4dd3 Merge "Fix crashing StrictJarFile due to doubled closing." am: 68ea36243d am: 15cd392108 am: 3199d58939
am: 37541865f3

Change-Id: Iae24b046178c00e4e8cda7ee1dc25c993ef38c0b
2016-12-07 02:09:12 +00:00
Tomasz Mikolajewski
37541865f3 Merge "Fix crashing StrictJarFile due to doubled closing." am: 68ea36243d am: 15cd392108
am: 3199d58939

Change-Id: I269b4a0a7fcbb30804a3dd39870cce927c2b9596
2016-12-07 02:01:12 +00:00
Tomasz Mikolajewski
3199d58939 Merge "Fix crashing StrictJarFile due to doubled closing." am: 68ea36243d
am: 15cd392108

Change-Id: I63034776a185682f11ea736b0d37a4b3be31bc47
2016-12-07 01:54:13 +00:00
Treehugger Robot
68ea36243d Merge "Fix crashing StrictJarFile due to doubled closing." 2016-12-07 01:40:48 +00:00
Stephen Chen
f1b75647a3 Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED.
Bug: 32913919
Test: n/a
Change-Id: Ied075bdcc1ebb8f0a4bc0d3bf9758fa6719ce0b9
2016-12-06 16:21:14 -08:00
Jeremy Joslin
2724906a6c Merge "API for requesting network recommendations." am: 800a4e753e am: 2b57c69e25
am: 33e8de479a

Change-Id: Ibf7f6a12eeb92f56c5873c3f7e3e10ff4adbd8fd
2016-12-07 00:12:27 +00:00
Jeremy Joslin
33e8de479a Merge "API for requesting network recommendations." am: 800a4e753e
am: 2b57c69e25

Change-Id: I8f2357942919193a22e97e4f1d9ec415b736565c
2016-12-07 00:05:29 +00:00
Jeremy Joslin
2b57c69e25 Merge "API for requesting network recommendations."
am: 800a4e753e

Change-Id: Icda431682a283051d4f5f5052dc70b8ab8e01dc9
2016-12-06 23:58:13 +00:00
Bill Yi
82834baa35 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 2016-12-06 15:17:16 -08:00
Treehugger Robot
800a4e753e Merge "API for requesting network recommendations." 2016-12-06 23:08:03 +00:00
TreeHugger Robot
892c750f17 Merge "Correct error in Configuration.updateFrom" 2016-12-06 22:38:20 +00:00
TreeHugger Robot
cb42822758 Merge "API for requesting network recommendations." 2016-12-06 21:17:23 +00:00
Jeremy Joslin
d1daf6d22a API for requesting network recommendations.
Defining a new system API that will allow the system to request
network recommendations from a NetworkScoreService implementation.

Test: Coming in a future CL.
BUG: 32909424
Merged-In: I2d5c0a843b928b04e87c1862a78702a02fd54c31
Change-Id: Idd33095c6cd2f5b391796c900399f18a2c40fcc3
2016-12-06 12:48:30 -08:00
Robert Carr
4647acb60e Correct error in Configuration.updateFrom
When updating the non direction members of screenLayout
we check that they are not in total undefined, before
accepting the new value in full. This was enough for LONG/SIZE
which are always undefined or set together. It seems we have paths
now where SCREENLAYOUT_ROUND however can be undefined and the others
will be set. In this case if we pass a configuration with SCREENLAYOUT_ROUND_UNDEFINED
but LONG/SIZE set to updateFrom then we will overwrite our previous SCREENLAYOUT_ROUND value.
This triggers extra configuration changes.

Bug: 33098677
Test: bit FrameworksCoreTests:android.content.res.ConfigurationTest
Change-Id: I6eb321d27011a2af2134d0ed5b6864d4cd902dc3
2016-12-06 12:34:35 -08:00
Stephen Chen
79046ce039 Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038 am: e70ef235fb
am: 70889ff69f

Change-Id: If076123dc3874615b058bbddfd3c4810f54b303d
2016-12-06 19:41:55 +00:00
Stephen Chen
70889ff69f Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038
am: e70ef235fb

Change-Id: I46186245e038597018f66e44459d724456e8f993
2016-12-06 19:34:46 +00:00
Stephen Chen
e70ef235fb Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db
am: 45fdf32038

Change-Id: I141248962fc0ce710b6860f3f67ca156ecdab46e
2016-12-06 19:27:45 +00:00
Stephen Chen
45fdf32038 Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
am: 70ae1bf4db

Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022
2016-12-06 19:20:24 +00:00
Mark Renouf
28f0e5bf48 Revert "Allow power button to close an input method"
This reverts commit d28e907183.
Test: manually tested

BUG: 33038203
Change-Id: I7a4c6e95a69abb2e40df73509b6e67b93eacf6ff
2016-12-06 17:43:28 +00:00
George Mount
5a2a948be7 Fix slow exit transition left exited views INVISIBLE.
Bug 33377297

When an exit transition was finished after the onStop was received,
the final visibilty ended up being INVISIBLE. To prevent this,
when views are being reset to the initial location, the transitions
are forced to end prior to changing the final values.

Test: I10517bb5f1477824f1e54109e7be766225591d24
Change-Id: I3837927bb41623a3a146fc3a42209c9a81c99a38
2016-12-06 09:31:06 -08:00
Jeremy Joslin
1397837af3 API for requesting network recommendations.
Defining a new system API that will allow the system to request
network recommendations from a NetworkScoreService implementation.

Test: Coming after the API is approved.
BUG: 32909424
Change-Id: I2d5c0a843b928b04e87c1862a78702a02fd54c31
2016-12-06 07:33:25 -08:00