251747 Commits

Author SHA1 Message Date
Lajos Molnar
818f7c8c1a Merge \"media: document VP9 CSD for MediaCodec\" into nyc-dev
am: 1fe8871f04

Change-Id: I20c207b5bc735221eaf8982759d00b7a2a89a983
2016-06-28 22:32:07 +00:00
Lajos Molnar
1fe8871f04 Merge "media: document VP9 CSD for MediaCodec" into nyc-dev 2016-06-28 22:27:53 +00:00
Lajos Molnar
2d9139410f Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am: af9d9f9b3e

Change-Id: I9a34f84efbc54d49ecc90c1e095be643d26876d3
2016-06-28 22:27:05 +00:00
Lajos Molnar
29522123db Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am: 556e012979

Change-Id: I259b49699bf3e606da8e40aba85288b5a41fe31f
2016-06-28 22:26:58 +00:00
Lajos Molnar
af9d9f9b3e Merge "media: document rotation and scaling issues for MediaCodec" into nyc-dev 2016-06-28 22:21:02 +00:00
Lajos Molnar
556e012979 Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-dev 2016-06-28 22:19:30 +00:00
Oren Blasberg
b926d0e8ef Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am: 29ea814354

Change-Id: I722e88756c576acca7419d53738d5883bf864260
2016-06-28 21:19:30 +00:00
Oren Blasberg
29ea814354 Merge "Fix popup context menu appearing brokenly." into nyc-dev 2016-06-28 21:12:28 +00:00
Felipe Leme
2f285643bf Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am: c1374208e3

Change-Id: Iae3e7fb2ff674046422cc77f10761c8543cd83c5
2016-06-28 20:48:51 +00:00
TreeHugger Robot
c1374208e3 Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev 2016-06-28 20:45:40 +00:00
Oren Blasberg
0e8ce872f1 Fix popup context menu appearing brokenly.
Add missing attribute to the base Theme to ensure the context menu
does not appear completely invisibly.

Bug: 29796385
Change-Id: I4f50579622e97656e09a5ddb6e13313f84efc972
2016-06-28 12:41:30 -07:00
Felipe Leme
bdf1c719c9 Merge \"Fixed whitelistManager set on unbindServiceLocked()\" into nyc-dev
am: 8d78c33c9b

Change-Id: Ie86c30d925119f4ebfdb420ff0093d508e8274cb
2016-06-28 19:22:34 +00:00
Todd Kennedy
08739a2778 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: Ib3d99a331f49c2e8af2fcda24149314fc939f4c0
2016-06-28 19:16:35 +00:00
TreeHugger Robot
8d78c33c9b Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev 2016-06-28 19:15:34 +00:00
TreeHugger Robot
a98e3e3ede Merge "Default minSdkVersion to '1'" into nyc-dev 2016-06-28 19:12:49 +00:00
Felipe Leme
dd85da6e94 Remove redundant setPendingIntentWhitelistDuration() calls.
Since all pending intents are stored on a Set in the Notication object,
there is no need to individually check for specific pending intents.

BUG: 29480440
Change-Id: I27a18bb535a9a4bb6cb4e76bdc189e6c315a684a
2016-06-28 11:34:54 -07:00
Felipe Leme
a7778b0654 Fixed whitelistManager set on unbindServiceLocked()
It must call updateWhitelistManagerLocked() because the app might have
other services with the whitelistManager set, in which case the process
record should not have whitelistManager reset.

Fixes: 29480440

Change-Id: I268278c646aaa89a352f02178b294c02c3c11d35
2016-06-28 10:41:45 -07:00
Lajos Molnar
4461356ea8 media: document rotation and scaling issues for MediaCodec
Bug: 23709311
Bug: 28512795
Change-Id: Iddebd13b4cd4c50bca8736d3aca71571ad16633a
2016-06-28 10:38:34 -07:00
Todd Kennedy
4f6570878c Default minSdkVersion to '1'
Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.

Bug: 29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e
2016-06-28 10:31:05 -07:00
Allen Hair
fb9d75e7cd Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073

Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9
2016-06-28 17:30:28 +00:00
Allen Hair
15783f0073 Merge "Add a flag to enable instrumentation of the framework classes." into nyc-dev 2016-06-28 17:23:55 +00:00
Daniel Yu
a2ffb20c06 Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
am: 6ec78a6458

Change-Id: I8c631533ad43598475938bc1e3f9f0f171511c0a
2016-06-28 16:28:34 +00:00
Dan Yu
6ec78a6458 Merge "resolve merge conflicts of ac5b340 to nyc-dev" into nyc-dev 2016-06-28 16:21:57 +00:00
Shreyas Basarge
0d27e2d624 Merge \"SyncOperation float cast fix\" into nyc-dev
am: 5f72b129c4

Change-Id: I907544c36783e192a17a2aa7f629a3093a516de2
2016-06-28 15:42:59 +00:00
Shreyas Basarge
5f72b129c4 Merge "SyncOperation float cast fix" into nyc-dev 2016-06-28 15:38:07 +00:00
Dan Sandler
45294a6859 Purr.
am: 610f6ede25

Change-Id: I0dc3c9da110b8a92ecde6dbc28eb572a148ad6f5
2016-06-28 07:07:35 +00:00
Dan Sandler
3fae8ae0c6 One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae
2016-06-28 07:07:31 +00:00
Dan Sandler
ed48cbc8fc Fix SuperNotCalledException.
am: 04f8cc2bb3

Change-Id: Ic981a15b565092ea13a618c7ac0ed9d000854362
2016-06-28 07:07:28 +00:00
Dan Sandler
610f6ede25 Purr.
Bug: 27376882
Change-Id: I071d00c9a7847b8ff9b263ffd17581079b78a432
2016-06-28 01:25:08 -04:00
Dan Sandler
4b7e415803 One final tweak to the platlogo.
Bug: 27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f
2016-06-27 22:59:24 -04:00
Dan Sandler
04f8cc2bb3 Fix SuperNotCalledException.
Q. Dan, how did you make such a basic newbie mistake?
A. new phone who dis

Bug: 29779845
Change-Id: Iecba53effcf6252df228afd2cc80df43b2afaa59
2016-06-27 22:59:24 -04:00
Svet Ganov
5f7f3fa7a9 Merge \"Mark app pending intents in notification extras\" into nyc-dev
am: b2cd9c95bf

Change-Id: Iac3970763cbaac36ede1b17df7e65001ad6c8447
2016-06-28 00:46:58 +00:00
Svetoslav Ganov
b2cd9c95bf Merge "Mark app pending intents in notification extras" into nyc-dev 2016-06-28 00:42:24 +00:00
Svet Ganov
ddb948896c Mark app pending intents in notification extras
We need to make every peniding intent that went in the notification
system to allow special handling of such intents when fired by a
notification listener. If a pending intent from a notification
is sent from a notification listener, we white-list the source app
to run in data saver mode for a short period of time. The problem is
that actions and the notificaion can have extras which bundles may
contain pending intents but the system cannot look into the bundles
as they may contain custom parcelable objects. To address this we
keep a list of all pending intents in the notification allowing
the system to access them without touching the bundle. Currently
the pending intents are written to the parcel twice, once in the
bundle and once as the explicit list. We can come up with a scheme
to optimize this but since pending itents are just a binder pointer
it is not worth the excecise.

bug:29480440

Change-Id: I7328a47017ca226117adf7054900836619f5679b
2016-06-27 17:32:25 -07:00
Allen Hair
0e4f014c20 Add a flag to enable instrumentation of the framework classes.
Bug: 29777843
Change-Id: I0f3639ad1303a9b2cc612f99cde427dedff4874f
2016-06-27 17:20:24 -07:00
Dianne Hackborn
9525331c5e Merge \"Fix bug where process whitelist manager state would not be correct.\" into nyc-dev
am: a39d380651

Change-Id: I78f5a67a6b08f1275c66b7543e91b2bd016d621e
2016-06-27 23:57:05 +00:00
Dianne Hackborn
a39d380651 Merge "Fix bug where process whitelist manager state would not be correct." into nyc-dev 2016-06-27 23:52:01 +00:00
Pavlin Radoslavov
e7ce279d9a Merge \"Add extra waiting when switching users\" into nyc-dev
am: 4d6be6b308

Change-Id: I3c54d6666d8327a0915d839ec02715961e62565a
2016-06-27 23:46:30 +00:00
Andre Eisenbach
4d6be6b308 Merge "Add extra waiting when switching users" into nyc-dev 2016-06-27 23:42:17 +00:00
Christopher Tate
0bdb4cef4a Merge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
am: f480698298

Change-Id: I56aa1a6ecb2409b905de4a8419e1b76523120efc
2016-06-27 23:24:03 +00:00
Chris Tate
f480698298 Merge "Fix #29737133 : content-trigger jobs not running properly" into nyc-dev 2016-06-27 23:18:31 +00:00
Christopher Tate
4b425712c6 Fix #29737133 : content-trigger jobs not running properly
When removing the ContentObserver wrapper from our internal
bookkeeping we were using the wrong key.  That led to future
re-registrations thinking they were reusing a currently-
registered observers, but instead never getting onChange()
notifications.

Change-Id: Id3111db057ae63194049d7d48d45b75be6bb0000
2016-06-27 16:12:41 -07:00
Pavlin Radoslavov
4140111167 Add extra waiting when switching users
If disabling Bluetooth times out, wait for an additional amount of time
to ensure the process is shut down completely before attempting to restart.

Bug: 29738770
Change-Id: I43dec35a1e03d12cb07863babea97d55baa32528
2016-06-27 23:09:09 +00:00
Dianne Hackborn
a590d2be93 Fix bug where process whitelist manager state would not be correct.
We can't update this in updateOomAdjLocked(), because we very
deliberately only iterate through services in there as needed.
The correct thing to do is update the process as services/connections
are associated with it, so do that.

Now basically all of the logic for tracking the state is in
ActiveServices, as we bind and unbind services and add and removing
them from process records.  It's a little messy because we don't
have a central place for removing them from process records, which
should be cleaned up in the future.

Part of fixes for issue #29480440

Change-Id: Iac96f002a5b4e3b0277df244ff7b90f59a6e8440
2016-06-27 15:40:38 -07:00
John Reck
aecf607eb6 Merge \"Add missing roundOut for layer damage\" into nyc-dev
am: 48cde353eb

Change-Id: If4ca933e218fc33fa78dc063b687e03793635e6c
2016-06-27 22:28:39 +00:00
John Reck
48cde353eb Merge "Add missing roundOut for layer damage" into nyc-dev 2016-06-27 22:22:41 +00:00
John Reck
ac046387be Add missing roundOut for layer damage
fixes: 29771171

This is a regression from HWUI_NEW_OPS, a roundOut
was missing in the new path that was in the old one

Change-Id: Ibf223d550bb5525781864dd9b7f7cd6d73adb98b
2016-06-27 15:18:26 -07:00
Chris Craik
65c0d9d290 Round unclipped saveLayers
am: 45e83338e5

Change-Id: I3ecb7fdd2097779cf7f596c0e6a3f7914902ca39
2016-06-27 21:45:04 +00:00
Chris Craik
45e83338e5 Round unclipped saveLayers
fixes: 29456451

Change-Id: I2be8b47c46936e75071ad0819a718f72b96cbd2b
(cherry picked from commit d5a90114128f4d3d528f1a0e93651496c968f940)
2016-06-27 21:06:35 +00:00
Andrii Kulian
fee6e7f102 Merge \"Resume only activities in focused stack\" into nyc-dev
am: 06b1d786e9

Change-Id: I05dfd276d13b97b06737fecd22b238e791c9bc2b
2016-06-27 21:02:56 +00:00