Adam Lesinski
cc903f425a
Fix regression with defaultDisplay adjustments am: f02523bf4b
...
am: be75a58447
2016-10-18 23:03:51 +00:00
Adam Lesinski
be75a58447
Fix regression with defaultDisplay adjustments
...
am: f02523bf4b
2016-10-18 22:55:14 +00:00
Adam Lesinski
f02523bf4b
Fix regression with defaultDisplay adjustments
...
ag/1542219 introduced a regression where if the display was the default
display, the configuration would still be adjusted as if it were
a non-default display. This fixes that logic to only adjust the
configuration if the display is non-default.
Bug:32133693
Test: cts-tradefed run cts --module CtsServicesHostTestCases --test android.server.cts.ActivityManagerAppConfigurationTests#testConfigurationUpdatesWhenRotatingToSideFromDocked
Change-Id: Ib2fda8c1651609efa9d20b3e2dace8a122864916
2016-10-18 20:13:57 +00:00
Bryce Lee
ccd3468567
resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp
...
Change-Id: Idb97adf36d981a340cdb5d24d4c3c3858d23e2fe
2016-10-18 10:07:00 -07:00
Bryce Lee
112ae34fea
Merge "Add a way to query for supported Bluetooth profiles." into cw-f-dev
2016-10-18 16:32:52 +00:00
Sanket Agarwal
933c625a92
Merge "Remove APIs that are not directly usable." am: 9cff57312d
...
am: 086be31642
2016-10-17 21:32:21 +00:00
Sanket Agarwal
086be31642
Merge "Remove APIs that are not directly usable."
...
am: 9cff57312d
2016-10-17 21:28:05 +00:00
Sanket Agarwal
fb6322425a
Remove APIs that are not directly usable.
...
The right way to expose this API is done via MediaBrowser.
Bug: b/28791287
Change-Id: I0a8a185934fd7aaa9f2b5eac7398955fa380060f
(cherry picked from commit b5fbb75aa2
2016-10-17 12:47:10 -07:00
Christopher Wiley
39c3166710
Merge "Add InterfaceConfiguration.isUp()" am: c7ea99a63c
...
am: 281d7490bf
2016-10-17 16:45:35 +00:00
Christopher Wiley
281d7490bf
Merge "Add InterfaceConfiguration.isUp()"
...
am: c7ea99a63c
2016-10-17 16:41:52 +00:00
Adam Lesinski
d7ec1ea697
Update DisplayMetrics even on default display am: 4309721843
...
am: dab7950d80
2016-10-14 22:41:35 +00:00
Adam Lesinski
dab7950d80
Update DisplayMetrics even on default display
...
am: 4309721843
2016-10-14 22:34:06 +00:00
Adam Lesinski
4309721843
Update DisplayMetrics even on default display
...
Fix a bug where the DisplayMetrics wouldn't be updated for a Resources
object on the default display. Since multi-window, we want to update
all Resources.
This didn't always manifest itself due to recreation of assets, which
would force an update of DisplayMetrics. Re-use of an AssetManager from
the cache would expose the bug.
Bug:32133693
Bug:31998629
Test: cts-tradefed run cts --module CtsServicesHostTestCases
Change-Id: Ic51ab82710517b87eb995ccf982085dba876ad58
2016-10-14 18:16:18 +00:00
Robert Sesek
856a791ddd
Merge "resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2016-10-14 14:08:00 +00:00
Michal Karpinski
fd0d22750f
Don't expose default strong auth timeout as constant am: 6dbf67fc48
...
am: bc755da55c
2016-10-13 23:00:24 +00:00
Michal Karpinski
bc755da55c
Don't expose default strong auth timeout as constant
...
am: 6dbf67fc48
2016-10-13 22:52:38 +00:00
TreeHugger Robot
a6b3caf58e
Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
2016-10-13 22:47:30 +00:00
Christopher Tate
86208efdc9
Only full-data back up regular files + directories am: da2018efeb
...
am: 0d816b8f69
2016-10-13 21:17:09 +00:00
Christopher Tate
0d816b8f69
Only full-data back up regular files + directories
...
am: da2018efeb
2016-10-13 21:13:00 +00:00
Greg Plesur
43ed3a5b6a
DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade.
...
am: 3514404984
2016-10-13 21:12:51 +00:00
TreeHugger Robot
b3ca7c26e1
Merge "Only full-data back up regular files + directories" into nyc-mr1-dev
2016-10-13 21:07:00 +00:00
Greg Plesur
216ee1f0e7
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev
2016-10-13 21:02:01 +00:00
Robert Sesek
aa3c463a5b
resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp
...
Change-Id: I374d842cab49b58b570d5ad7ef3dffb7b148d236
2016-10-13 16:49:47 -04:00
Dianne Hackborn
50468217c4
Fix issue #32125907 : Intent.replaceUnsafeExtras() corrupts original bundle am: 851ec49de7
...
am: 9774ea3646
2016-10-13 20:38:04 +00:00
Dianne Hackborn
9774ea3646
Fix issue #32125907 : Intent.replaceUnsafeExtras() corrupts original bundle
...
am: 851ec49de7
2016-10-13 20:31:43 +00:00
Christopher Tate
da2018efeb
Only full-data back up regular files + directories
...
Ignore every filesystem entity that is not a regular file or directory.
In particular, we now ignore not only symlinks but also sockets, pipes,
et cetera.
Bug 32143362
Change-Id: If51b54df1f7a643af145eb15bf12d389d19f8780
2016-10-13 12:19:45 -07:00
Greg Plesur
3514404984
DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should
...
return 'false' for Wear devices after pairing/upgrade.
BUG: 32019375
Change-Id: I2563efe58c98c5dd8440891e478c89e093d8d9ac
2016-10-13 15:08:14 -04:00
Dianne Hackborn
851ec49de7
Fix issue #32125907 : Intent.replaceUnsafeExtras() corrupts original bundle
...
We now recursively generate new Bundle objects if we need to
do any stripping.
Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4
2016-10-12 18:17:58 -07:00
Adrian Roos
7bc84b803d
Fix Notification.Action.Builder copy constructor am: 7af5362571
...
am: 342bc437bf
2016-10-12 23:25:20 +00:00
Adrian Roos
342bc437bf
Fix Notification.Action.Builder copy constructor
...
am: 7af5362571
2016-10-12 23:19:19 +00:00
TreeHugger Robot
5c8fc58850
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
2016-10-12 23:11:22 +00:00
Adrian Roos
7af5362571
Fix Notification.Action.Builder copy constructor
...
The copy constructor of Notification.Action.Builder did not copy
the mAllowGeneratedReplies field.
Change-Id: I40fbe8950ee2232e2589ab3930a32bfbebe9fc89
Fixes: 31766718
Test: runtest --path $T/cts/tests/app/src/android/app/cts/NotificationTest.java
2016-10-12 15:19:55 -07:00
Michal Karpinski
6dbf67fc48
Don't expose default strong auth timeout as constant
...
The admin can instead use the value of 0 to reset to default.
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Bug: 31430135
Change-Id: I0d6b29ca4eca65d7ca72a8975a0c28c9050a946c
(cherry picked from commit 943aabd11c
2016-10-12 09:34:12 +00:00
Alan Viverette
0754f59c4a
Add note about density scaling behavior to setImageURI am: ac21e56f63
...
am: 74c6d9bd3f
2016-10-12 01:42:06 +00:00
Alan Viverette
74c6d9bd3f
Add note about density scaling behavior to setImageURI
...
am: ac21e56f63
2016-10-12 01:36:33 +00:00
TreeHugger Robot
d35d3c98e4
Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev
2016-10-12 01:24:55 +00:00
Chet Haase
3267a2462d
Fix small typo in ShortcutManager header docs am: c158431f8e
...
am: 5aa0dfcc0a
2016-10-12 00:31:31 +00:00
Chet Haase
5aa0dfcc0a
Fix small typo in ShortcutManager header docs
...
am: c158431f8e
2016-10-12 00:19:46 +00:00
Christopher Wiley
08395dce6a
Add InterfaceConfiguration.isUp()
...
Bug: 31337216
Test: None
Change-Id: Ifd83b069472fc50c9517fc69306e7938a9e9628c
2016-10-11 16:47:44 -07:00
Alan Viverette
ac21e56f63
Add note about density scaling behavior to setImageURI
...
Bug: 27327999
Change-Id: I1e348a1fbda20fff9575261df7097fbd46381383
2016-10-11 23:32:10 +00:00
Chet Haase
c158431f8e
Fix small typo in ShortcutManager header docs
...
Bug: 32093275 fix typo in ShortcutManager javadocs
Test: no test, just words in the header docs
Change-Id: Icd33481a7f285686429d908cf92de0f6f886f962
2016-10-11 21:48:55 +00:00
Nick Kralevich
34547a8dc2
Delete "Show CPU usage" am: fc4a5c2d85
...
am: f0c0188a8a
2016-10-11 18:15:23 +00:00
Nick Kralevich
f0c0188a8a
Delete "Show CPU usage"
...
am: fc4a5c2d85
2016-10-11 18:09:10 +00:00
Nick Kralevich
ab7a44b41a
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
2016-10-11 18:03:29 +00:00
Nick Kralevich
fc4a5c2d85
Delete "Show CPU usage"
...
This functionality hasn't worked since Lollipop.
Bug: 21388590
Change-Id: Ie4388d88f6e06f3e2d2e84e9c4515b3ebc6a0ea5
2016-10-11 09:01:38 -07:00
Jeff Sharkey
6f5f03b8c1
Set MIME type when building BROWSE intents. am: 42a4aaab44
...
am: ac184d3c46
2016-10-10 23:34:28 +00:00
Jeff Sharkey
ac184d3c46
Set MIME type when building BROWSE intents.
...
am: 42a4aaab44
2016-10-10 23:29:28 +00:00
Robert Sesek
0b58f198df
resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp
...
Change-Id: I75c7110ee4f0c9717e7276b609caa2402ef5c2be
2016-10-10 18:34:42 -04:00
Jeff Sharkey
42a4aaab44
Set MIME type when building BROWSE intents.
...
If we created a BROWSE PendingIntent early during boot (while the
device was still locked), we would resolve the MIME type as "null"
meaning the intent would fail to launch.
Since we always know what the MIME type will be, set it explicitly.
Test: boot device while USB device attached
Bug: 30742481
Change-Id: I23c523cbe2660ca63a3b7df1f41300ab803b314c
2016-10-10 21:28:40 +00:00
Selim Cinek
e0c3c660a7
DO NOT MERGE - Added Emergency affordance feature
...
Added a service that listens whether emergency affordances
are necessary.
If the they are needed, it adds an option to the
global actions dialog that directly launches the
emergency call and also adds a long-press listener
to the keyguard emergency button.
Test: adb shell settings put global force_emergency_affordance 1 && adb shell settings put global emergency_affordance_number 111112
Bug: 30404490
Change-Id: Ib96a15da2ef4b568a8d77140ebca6aa6f20f5ddb
2016-10-10 18:58:23 +00:00
