Commit Graph

8404 Commits

Author SHA1 Message Date
The Android Automerger
f287780643 Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp 2016-08-30 00:26:21 +00:00
Etan Cohen
4503dc6fba [NAN] Provide calling package name to service
Useful for permission checks.

Bug: 30000323
Change-Id: I8c7f06cff346437aa24ca5da9822cbd7b20c59c4
(cherry picked from commit 7531a28e26)
2016-08-29 11:26:52 -07:00
Mark Lu
c4e81b64f1 docs: fix broken links in Activity reference
am: fa43485910

Change-Id: I67134251790b12d53d31c6854073884f498ef1e5
2016-08-26 00:42:01 +00:00
Mark Lu
fa43485910 docs: fix broken links in Activity reference
Bug: 30142414
Bug: 30837469
Change-Id: If370e49fee32df41b7dab93d6c89c79a9835dabb
2016-08-12 16:05:17 -07:00
Hemal Patel
3547fd0642 Docs: Fixed the link that loads Fragments guide am: a8e1c75bf6
am: dabee01e9b

Change-Id: I6e3156f2990ddfd73b34015be8a09c972729d26e
2016-08-09 21:10:34 +00:00
Hemal Patel
a8e1c75bf6 Docs: Fixed the link that loads Fragments guide
In the class description, fixed the reference link that points to the
Fragments guide.

Bug: 29007808
Change-Id: I3399e5f10c461eb6666a04f8829c6cde774948e0
2016-08-08 16:43:22 -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
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
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
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
Felipe Leme
2f285643bf Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am: c1374208e3

Change-Id: Iae3e7fb2ff674046422cc77f10761c8543cd83c5
2016-06-28 20:48:51 +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
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
Adam Lesinski
c038c55f62 Merge \"Update DisplayMetrics when resizing\" into nyc-dev
am: 34ccbe035a

Change-Id: I1b0b6711a3ad8c9fd29bbb967d59d59326fa7d25
2016-06-24 23:42:34 +00:00
Adam Lesinski
ac3e0e590a Update DisplayMetrics when resizing
Previously the DisplayMetrics passed to a new ResourcesImpl
object would be generated from the default DisplayAdjustments.
We now use the correct DisplayAdjustments for the ResourcesImpl
and make sure to update them for things like rotation changes.

Bug:29619314
Change-Id: If2ba0d7670a4554dcd3fde9766e2337f20a191fd
(cherry picked from commit 8e8d23214a)
2016-06-24 22:11:27 +00:00
smain@google.com
8c9bd9cb28 Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
am: fd0eeb0379

Change-Id: I3662c41848c20bfde90dcd453917e67f93693e74
2016-06-23 22:05:07 +00:00
smain@google.com
10e29b895e fix bad contrast in table links by switching to normal table cells instead of headings.
Change-Id: I91139ac2f01a9e099ffb5f65f4579a0b33ced5ab
2016-06-23 12:09:30 -07:00
Jeff Sharkey
803a316d6e Merge \"When uninstalling, only kill the requested user.\" into nyc-dev
am: 060d5a0e0a

Change-Id: I25a7bffc2c5f414fe326963c028000eaa492f540
2016-06-23 18:16:45 +00:00
TreeHugger Robot
060d5a0e0a Merge "When uninstalling, only kill the requested user." into nyc-dev 2016-06-23 18:03:27 +00:00
Jeff Sharkey
85f449eaba When uninstalling, only kill the requested user.
When an app is being uninstalled for a specific user, only kill the
app under that user; leave the app running under other users.

Bug: 28875343
Change-Id: Ie60753cfd22df10a2b17d8c3732b6f19d2fe1fb9
2016-06-23 10:15:17 -06:00
Dianne Hackborn
c7ebca2a36 Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am: 576e6d27bd

Change-Id: Ib4589d04fa8c157a51ccc87508969d5d93788242
2016-06-23 03:09:56 +00:00
Dianne Hackborn
576e6d27bd Merge "Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)" into nyc-dev 2016-06-23 03:04:26 +00:00
Dianne Hackborn
17c77536ec Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)
I really have no idea how this can be happening (we check
for a null intent before posting the args), but add another
check before dispatching to try to avoid it.

Change-Id: Ic704850c9750b6a078c49ea628189be568031086
2016-06-22 16:55:47 -07:00
Adam Lesinski
a72a6aae37 Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am: 0bf31c3fa6

Change-Id: If0da3136f1fcb17c43a5b8c22ca890b8abcfc25c
2016-06-22 19:17:43 +00:00
Adam Lesinski
0bf31c3fa6 Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev 2016-06-22 19:11:36 +00:00
Dianne Hackborn
56197c9e9e Merge \"Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
am: a62a7eef24

Change-Id: I62361e51b439e563b91e86d6886d5b46f64737b0
2016-06-22 17:18:38 +00:00
Dianne Hackborn
121e1645d1 Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
...isn't respected if previous job was scheduled with same URI

Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
2016-06-21 20:39:02 -07:00
Adam Lesinski
4ece3d6bb1 ContextImpl: Keep DisplayAdjustments and Display in sync
Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.

Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
2016-06-21 17:55:58 -07:00
Antonio Cansado
13cf0e7d54 Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
am: c20ffc2a9e

Change-Id: I477910de04ef5a9a35d795240b93c3cf56e78042
2016-06-20 22:29:49 +00:00
Antonio Cansado
c20ffc2a9e Merge "Fix infinite loop when registering data usage callback." into nyc-dev 2016-06-20 22:23:36 +00:00
Antonio Cansado
f704837429 Fix infinite loop when registering data usage callback.
Trivial fix is to call the method that takes the handler as a param.

Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
2016-06-20 15:03:03 -07:00
Christopher Tate
abf0d56469 Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
am: 0f101342e1

Change-Id: Ie0f51529e4cad6f3c68c49b2b1e1d0baca6222b6
2016-06-20 17:35:04 +00:00
Robin Lee
8a8a489bbf Remove @return from void API javadoc
am: 6918675fa1

Change-Id: Ie91f340ac28868a00197898b662cb809c750ec65
2016-06-20 17:30:34 +00:00
Chris Tate
0f101342e1 Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev 2016-06-20 17:19:55 +00:00
Robin Lee
6918675fa1 Remove @return from void API javadoc
Fix: 29500429
Change-Id: Ieddf211ad881e2e48bf593dcde6d262dd5be6c5c
(cherry picked from commit b3d6b13ad5)
2016-06-20 14:53:58 +00:00
Christopher Tate
6b24c84fa2 resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
am: 1c3be1a5b1

Change-Id: If28cb6bef6bb51540e03aede5ade118ad61805dd
2016-06-17 00:38:13 +00:00
Christopher Tate
1c3be1a5b1 resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e
am: d2a4e1b39c

Change-Id: I8e59a88278ba50ab7e3768031611065131ed6834
2016-06-17 00:32:26 +00:00
Christopher Tate
d2a4e1b39c resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab
am: e2c9b1af3e

Change-Id: Iab52ff84be41c1d18274d1a82492b624a7456726
2016-06-17 00:24:29 +00:00
Christopher Tate
e2c9b1af3e resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
am: d6c1126fab

Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab resolve merge conflicts of cffb19c to mnc-dev
am: 3f9ea2d386

Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
2016-06-17 00:15:07 +00:00
Christopher Tate
3f9ea2d386 resolve merge conflicts of cffb19c to mnc-dev
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
2016-06-16 16:31:39 -07:00
Christopher Tate
cffb19c812 Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7
am: ec6c3f7a32

Change-Id: Idc2b6c712078493b4186edad750d8d5beab58adf
2016-06-16 22:30:17 +00:00
Christopher Tate
cd777e95a7 Don\'t trust callers to supply app info to bindBackupAgent()
am: c58054f25f

Change-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c
2016-06-16 22:21:37 +00:00
Christopher Tate
e227ec61c2 Let bmgr inspect the set of whitelisted transports
Needed for compliance testing.

Bug 29072466

Change-Id: I025058ab9197f9e2db062bf0074e79f1cd04b443
2016-06-15 17:40:31 -07:00
Adam Lesinski
c3ab1b7c0a Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
am: 464bda8a2b

Change-Id: I352c56482aca030efab49ca39301679b51e44e05
2016-06-15 22:44:43 +00:00