Commit Graph

59635 Commits

Author SHA1 Message Date
Felipe Leme
bc84c54a2b Merge \"Fixed statuses on Battery Saver column.\" into nyc-dev
am: 24b2e7bbee

Change-Id: I7920617a1506817b25ade8e92bfb1945d2f173bb
2016-07-14 18:23:34 +00:00
Felipe Leme
24b2e7bbee Merge "Fixed statuses on Battery Saver column." into nyc-dev 2016-07-14 18:10:56 +00:00
Felipe Leme
9e325706f4 Fixed statuses on Battery Saver column.
BUG: 30139400

Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
2016-07-14 11:04:49 -07:00
Adam Lesinski
165e9d92b2 Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am: f8e99e72e7

Change-Id: Id29ae90fd336657d428a15fa0730b95d717386db
2016-07-14 01:50:52 +00:00
Adam Lesinski
e60064ab3c Don't hold on to AssetManager instances
If we enter multi-window mode or load WebView
assets into a Resources object, then the underlying
AssetManager instance may change.

crbug.com/627586

Bug:30118654

Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
2016-07-14 00:22:12 +00:00
Vladislav Kaznacheev
8496bb82d2 Fix docs for View.DRAG_FLAG_GLOBAL
am: 9a44eaec53

Change-Id: I4b0548a4fb7bff0312d2cd73217f64f361216c50
2016-07-13 00:08:52 +00:00
Vladislav Kaznacheev
9a44eaec53 Fix docs for View.DRAG_FLAG_GLOBAL
Document that cross-app drags only involve apps compiled for API 24 or later.

Bug: 30076806
Change-Id: Ia630f4623c23d787b52692ff1f6475408cefa177
2016-07-12 15:24:48 -07:00
Amith Yamasani
c6b85035b4 Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am: e278cf7665

Change-Id: Idd28d2ca2f46e8745392b5194dd2c8c370213ff7
2016-07-12 17:47:05 +00:00
Amith Yamasani
e278cf7665 Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev 2016-07-12 17:40:13 +00:00
Vladislav Kaznacheev
879b3fb9ce Merge \"Fix docs for DragEvent\" into nyc-dev
am: b6fa207c67

Change-Id: I33c231d19065a5acc26472d4c3f175351d2a6d10
2016-07-11 23:26:05 +00:00
TreeHugger Robot
b6fa207c67 Merge "Fix docs for DragEvent" into nyc-dev 2016-07-11 23:17:42 +00:00
Amith Yamasani
75db125ebb Include new constant for encryption status in the getter's javadoc
Added a bit more information in the javadocs about the new constant
ENCRYPTION_STATUS_ACTIVE_PER_USER in related methods/constants so
that developers don't miss checking for that constant when targeting
API Level 24.

Change-Id: Id9cd6248637fe0fc28d5161344abe02614b5f502
Fixes: 30073719
2016-07-11 15:02:18 -07:00
Vladislav Kaznacheev
3067bc69d9 Fix docs for DragEvent
Document that getClipDescription() and getLocaState() do not return valid data
when getAction() == DragEvent.ACTION_DRAG_ENDED.

Bug: 30016099
Change-Id: Id98fe8c5d6f052fc51c8c9e8d55329e162bd96b1
2016-07-11 13:52:22 -07:00
Mark Lu
e67f00705f Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
am: 162a6fad72

Change-Id: Ifb20f4b32ec6a6972a5ee1f832d91e1c169bb543
2016-07-11 20:20:39 +00:00
Mark Lu
162a6fad72 Merge "docs: fixed broken link in UsbManager javadocs" into nyc-dev 2016-07-11 20:13:47 +00:00
Svet Ganov
8503bf31bf Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
am: dcf2e205bf

Change-Id: If7706e1286847e02df34b6fce48c8de99b726d7d
2016-07-06 22:17:03 +00:00
Svet Ganov
51b839544b Use proper lock when accessing the generation registry
We use 'this' for synchronization in NameValueCache but some code
that accesses the generation registry uses 'this' in a different
context ending up syncing on the wrong instance. This is why
sync on this is just a bad idea.

bug:29956424

Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee
2016-07-06 19:52:36 +00:00
Felipe Leme
620936768f Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
am: a98e4512df

Change-Id: Ibfa5a20731caae48c7961ab0452a72d7bff34cf0
2016-06-30 23:37:13 +00:00
Svetoslav Ganov
a98e4512df Merge "Removed warning when objects are added on wrong order." into nyc-dev 2016-06-30 23:28:59 +00:00
Felipe Leme
7709041c99 Removed warning when objects are added on wrong order.
append() is used to optimized insertions in the array, but it must
preserve the order of the hashcode array; when it doesn't, it falls back
to append(), but it should not log a warning message

In particular, PendingIntentRecords might have different hashcodes
across different processes.

Fixes: 29912192
Change-Id: I0ab566249829ddb934fd51cf21399b68cb286bd5
2016-06-30 23:19:08 +00:00
Adrian Roos
1b7dbd9253 Merge \"Fix missing header text in notification groups\" into nyc-dev
am: a275ec269f

Change-Id: Ib2dc310b57756218d0851d7aff6a0ea183714f5d
2016-06-30 23:07:40 +00:00
Adrian Roos
9dfb78fab6 Fix missing header text in notification groups
Fixes a case where notification header text could go missing
if a notification view was recycled and previously had a header text.

Reapplying only hid the text without clearing it, so the extraction
logic thought it was still there and hid the text for the children
even though it was not showing for the parent.

Change-Id: I3f96e1e7bebb2f815020d278ad13b2b5d948e63c
Fixes: 29915184
2016-06-30 15:46:15 -07:00
Alan Viverette
bf91103763 Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
am: 4b736ea56d

Change-Id: Ic10c4641d90f06b52d34285e42c35ae744f823eb
2016-06-30 17:36:00 +00:00
Alan Viverette
4b736ea56d Merge "Only clip PopupWindow in the vertical direction" into nyc-dev 2016-06-30 17:24:22 +00:00
Alan Viverette
176f9cb656 Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev
am: 7705d5fd6e

Change-Id: I9a478a5dd666c8c938206e888065dbec976a9e82
2016-06-30 17:19:43 +00:00
Alan Viverette
9705fa0602 Only clip PopupWindow in the vertical direction
Bug: 29865091
Change-Id: Ic4e3b50571034f341aff2c2fbf2c349342622448
2016-06-30 13:17:26 -04:00
TreeHugger Robot
7705d5fd6e Merge "Exclude children from excess space distribution when using largest child" into nyc-dev 2016-06-30 17:07:07 +00:00
Alan Viverette
070b22bdee Exclude children from excess space distribution when using largest child
Preserves API 23 behavior.

Bug: 29872769
Change-Id: I514cde81dcca4d78238f407251805cced4c0bea1
2016-06-30 11:15:36 -04:00
Tobias Thierer
6b473f7b67 Merge \\"Changes for upgrade to OkHttp 2.7.5\\" am: a31247bd8d
am: f6bcab7f97

Change-Id: I7a1c9838a22cb7e8228e77bde68283fda57c83d6
2016-06-30 12:59:22 +00:00
Tobias Thierer
f6bcab7f97 Merge \"Changes for upgrade to OkHttp 2.7.5\"
am: a31247bd8d

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280
2016-06-30 12:49:47 +00:00
Jeff Sharkey
ce3c8ac0f4 Move getRecentTasks() to ParceledListSlice.
am: 479212cf50

Change-Id: Ifb3a5deacda0ff8b73469234d36f9cf711e616c2
2016-06-29 23:53:57 +00:00
Jeff Sharkey
479212cf50 Move getRecentTasks() to ParceledListSlice.
In extreme cases the list of recent tasks can grow beyond the size
of a single Binder transaction.  This change moves over to
ParceledListSlice which handles chunking any large results.

Bug: 29635557
Change-Id: Iaf1227234f5f8c9451f73a6a5c1dc89f2067f05f
2016-06-29 22:17:41 +00:00
Dianne Hackborn
381f4eb9be Merge \"Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am: 205bc262ce

Change-Id: I910f4db4503ad20ecce46032691001d1f971bdbf
2016-06-29 20:45:36 +00:00
Dianne Hackborn
1150b735c8 Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
2016-06-29 11:49:01 -07:00
Tobias Thierer
851d806dbd Changes for upgrade to OkHttp 2.7.5
- Use com.android.okhttp.Dns in place of com.android.okhttp.internal.Network
 - Specify TimeUnit.MILLISECONDS for timeouts which 2.7.5 allows and
   brings us closer to 3+

Change-Id: I95b5d72a94ebe1389f7c2e8d95903aa1aadd944b
2016-06-29 17:41:32 +01: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
Todd Kennedy
08739a2778 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: Ib3d99a331f49c2e8af2fcda24149314fc939f4c0
2016-06-28 19:16:35 +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
Mark Lu
8b739903a9 docs: fixed broken link in UsbManager javadocs
Bug: 29236606
Change-Id: I07fc82d741c106b6a679b7881757d4293359d384
2016-06-28 11:27:23 -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
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
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
John Reck
8a953d02d9 Merge \"Add missing null checks\" into nyc-dev
am: 02e391585d

Change-Id: Ib081c05d197b01ec3a9039941dd1265bf0b9b92c
2016-06-27 17:06:22 +00:00
John Reck
474659ccc4 Add missing null checks
Bug: 29743482
Change-Id: Ic4bc5b9d5718eabd41e09a108a765b01aef4e3c8
2016-06-27 07:56:37 -07:00
Adam Lesinski
c038c55f62 Merge \"Update DisplayMetrics when resizing\" into nyc-dev
am: 34ccbe035a

Change-Id: I1b0b6711a3ad8c9fd29bbb967d59d59326fa7d25
2016-06-24 23:42:34 +00:00
TreeHugger Robot
34ccbe035a Merge "Update DisplayMetrics when resizing" into nyc-dev 2016-06-24 23:35:13 +00:00
Adam Powell
242a44395e Merge \"Fix layout issue after insets changed\" into nyc-dev
am: 119f1715b3

Change-Id: I3dc13e068c258a74acee79e6ab6a75b569c891e8
2016-06-24 23:28:37 +00:00
TreeHugger Robot
119f1715b3 Merge "Fix layout issue after insets changed" into nyc-dev 2016-06-24 23:21:29 +00:00
Robert Carr
be87ca9efa Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev
am: 8afc1f70f0

Change-Id: Ifcc58b9c6a4bdaf3df0dc49ac963bdc7e32aa409
2016-06-24 22:50:45 +00:00