Commit Graph

250618 Commits

Author SHA1 Message Date
Adam Seaton
ad1008d089 Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev 2016-08-22 04:29:18 +00:00
Adam Seaton
0f1e7ab1d3 Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev 2016-08-21 21:18:05 +00:00
Andy Hung
05a1df9967 DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information
Bug: 30737845
Change-Id: Id092086862bc527fccc5e9f34c8a3ab16167ae92
(cherry picked from commit 737d9fb181)
2016-08-20 22:52:28 +00:00
George Mount
c9373e5505 DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity.
Bug 30786309

If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.

Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit 3289bfa289)
(cherry picked from commit a3edbf6a5d)
2016-08-20 22:37:45 +00:00
Todd Kennedy
bab7c28e5e DO NOT MERGE ANYWHERE: Release mPackages lock earlier
We cannot hold mPackages when calling into generatePackageDexopts().
This method takes Package Manager's mInstallLock. By holding mPackages,
we have lock inversion and hilarity ensues.

Change-Id: Ia11a158677051e3511702f38cde6780e75b256fb
Fixes: 30927731
(cherry picked from commit a8d4f48997)
2016-08-20 22:30:18 +00:00
Dirk Dougherty
b78a9bc5fe Doc change: updates for final N landing page and related resources.
am: b0ca00431f

Change-Id: Ie9aee46ce91c20c520ff6e96431e3fb7dcb6bbf1
2016-08-20 06:02:10 +00:00
Dirk Dougherty
b0ca00431f Doc change: updates for final N landing page and related resources.
Change-Id: Ieeb3dd74a889d6c0118e4ca8575abdaddcde7e73
2016-08-19 19:38:47 -07:00
David Friedman
e5036b3cab Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev
am: 410ae5b004

Change-Id: Ieb4eca6c8f3b13c2b3741cd66db7b86373c93faf
2016-08-19 21:33:04 +00:00
David Friedman
2663c419c0 Docs: Adding information to Building-for-Billions landing page.
am: cbaf3f9986

Change-Id: Ide25973773191866cbf39bbdde78bd6c6c01b8a6
2016-08-19 21:33:00 +00:00
David Friedman
c02c6b8fb0 Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev
am: 162a0005ac

Change-Id: I2bbe7a2f7f82aab86e4d30acc78e817a8a40dac7
2016-08-19 21:32:54 +00:00
David Friedman
f5c5eb0045 Docs: Adds a redirect to make it easier to access Performance section on DAC.
am: 196cb73dbb

Change-Id: I3e17031b6c3b9be5a6e42ce5c7e908e1b29926b5
2016-08-19 21:32:50 +00:00
David Friedman
410ae5b004 Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev 2016-08-19 21:17:56 +00:00
David Friedman
162a0005ac Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev 2016-08-19 21:16:56 +00:00
Jim Miller
41d1827fd3 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195 am: 364a51221a -s ours
am: ce0856f702

Change-Id: I4ac8f75786f2e3f1584ecf6c0a924999034825c2
2016-08-19 20:31:46 +00:00
Jim Miller
ade6f4df5b Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991 am: 85c390e9fb -s ours
am: f159feff98

Change-Id: I48332039882c1367989424c5005c5b60df8bc7a0
2016-08-19 20:31:42 +00:00
Jim Miller
ce0856f702 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195
am: 364a51221a  -s ours

Change-Id: Iccf0d83b5bbf076684343a0979d7eac718be0603
2016-08-19 20:23:50 +00:00
Jim Miller
f159feff98 Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991
am: 85c390e9fb  -s ours

Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21
2016-08-19 20:23:45 +00:00
Jim Miller
364a51221a Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42
am: ddf70b9195

Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
2016-08-19 20:16:37 +00:00
Jim Miller
85c390e9fb Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2
am: 9f04985991

Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
2016-08-19 20:16:34 +00:00
Jim Miller
ddf70b9195 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
am: 02e9affa42

Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
2016-08-19 20:09:43 +00:00
Jim Miller
9f04985991 Bind fingerprint when we start authentication - DO NOT MERGE
am: b6f4b48df2

Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
2016-08-19 20:09:41 +00:00
TreeHugger Robot
02e9affa42 Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev 2016-08-19 20:03:48 +00:00
David Friedman
196cb73dbb Docs: Adds a redirect to make it easier to access Performance section on DAC.
d.android.com/performance will now take you to d.android.com/topic/performance

Change-Id: I56bc85f156a9cb05a664fbf361eb5b99e153b419
2016-08-19 18:58:28 +00:00
David Friedman
cbaf3f9986 Docs: Adding information to Building-for-Billions landing page.
Bug: 30700934

Change-Id: I6d6ffafd674340e15e32c04a8bf08ba7fec402a8
2016-08-19 11:51:24 -07:00
Sudheer Shanka
105453e170 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9 am: 58def3804c -s ours
am: e49de5e073

Change-Id: I7330c5050c91e7dbaa99ca241f046b051fcd66a9
2016-08-19 18:10:03 +00:00
Amith Yamasani
d09a6aa0f0 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7 -s ours
am: f705730667

Change-Id: Ib6684a9fc5f6333240690f5b9d5df3643251db03
2016-08-19 18:10:00 +00:00
Sudheer Shanka
e49de5e073 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9
am: 58def3804c  -s ours

Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d
2016-08-19 18:02:26 +00:00
Amith Yamasani
f705730667 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365
am: 5841c492a7  -s ours

Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551
2016-08-19 18:02:22 +00:00
Sudheer Shanka
58def3804c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5
am: 08eb52f9f9

Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
2016-08-19 17:54:21 +00:00
Amith Yamasani
5841c492a7 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27
am: 39c7879365

Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
2016-08-19 17:54:19 +00:00
Sudheer Shanka
08eb52f9f9 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb
am: 7e890c8eb5

Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
2016-08-19 17:32:47 +00:00
Amith Yamasani
39c7879365 DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4
am: 29ae7b1a27

Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
2016-08-19 17:32:44 +00:00
Sudheer Shanka
f1e0a4a60c Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
am: badc5cd942

Change-Id: I185ac4f8a3a7905510e3dbe805aebfbdedec049c
2016-08-19 17:23:07 +00:00
Amith Yamasani
ac9bb3886d DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: 55eacb9441

Change-Id: I30549f0235dafa3dcb97f6207b0eda1a3ec8fbd3
2016-08-19 17:23:04 +00:00
Sudheer Shanka
7e890c8eb5 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am: b51e98becb

Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
2016-08-19 17:22:29 +00:00
Amith Yamasani
29ae7b1a27 DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: d1eeb5b7b4

Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
2016-08-19 17:22:25 +00:00
Sudheer Shanka
b51e98becb Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev 2016-08-19 17:06:55 +00:00
Sudheer Shanka
badc5cd942 Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev 2016-08-19 17:06:49 +00:00
Jim Miller
b6f4b48df2 Bind fingerprint when we start authentication - DO NOT MERGE
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.

Fixes bug 30744668

Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
2016-08-19 03:46:40 +00:00
Svetoslav Ganov
d44d46aa50 Add resource based mechanism to grant default permissions
This CL adds a mechanism for an OEM to grant default permissions
using the build system. This allows permissions for which they
got default grant exceptions to be added without modifying the
platform code. The format is a simple XML listing the packages
and the permissions to be granted for a package. The XML file
is placed in etc/default-permissions.

bug:29546655
bug:30929033

Change-Id: Ib6d671dac9201812bd2c47010c2c4b1330ef6b6e
2016-08-18 18:39:33 -07:00
Scott Main
97d6427ab0 Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev
am: 66ffbbfdf9

Change-Id: Ib72ec2497e7b58c42ecca05cc318d7345e9fce69
2016-08-19 01:12:09 +00:00
smain@google.com
3872e56f69 fix redirect for AIDL doc bug: 5967288
am: 9ad944f8c9

Change-Id: I8614af80ea19a68d078ea578d2f8e7a3286f930a
2016-08-19 01:12:05 +00:00
Scott Main
66ffbbfdf9 Merge "fix redirect for AIDL doc bug: 5967288" into nyc-dev 2016-08-19 01:04:03 +00:00
Narayan Kamath
b8f0cd0248 Merge "Process: Fix communication with zygote." into nyc-dev
am: cce8af824a

Change-Id: I9e945b2a660d5daf57d7c51e8e7c9d814e78a728
2016-08-18 23:08:51 +00:00
Narayan Kamath
99f960f7da Process: Fix communication with zygote.
am: 448be0a622

Change-Id: I530a1f04545a796d22ca59141aa8fe3de349388c
2016-08-18 23:08:49 +00:00
smain@google.com
9ad944f8c9 fix redirect for AIDL doc
bug: 5967288

Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
2016-08-18 14:41:47 -07:00
Narayan Kamath
cce8af824a Merge "Process: Fix communication with zygote." into nyc-dev 2016-08-18 10:14:31 +00:00
TreeHugger Robot
4b30053ede Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-08-18 01:23:05 +00:00
TreeHugger Robot
1af694510d Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev 2016-08-18 01:14:32 +00:00
Adam Lesinski
f2d87eba75 AppIdleHistory: Only write screen on durations during regular sync
Stop writing to disk every time the display goes off. Only write to
disk periodically.

Consequences

Previously, if the device rebooted after the screen duration was written
to disk, apps would appear more stale than they actually were.

Now apps will always look fresher, which is a better scenario.

Bug:30807864
Change-Id: Ia69a2e51fc9e397789215b449fae56fa3e29c74a
2016-08-17 16:42:46 -07:00