OSDN Git Service
Svet Ganov [Tue, 14 Jul 2015 02:49:27 +0000 (02:49 +0000)]
Svet Ganov [Tue, 14 Jul 2015 02:34:19 +0000 (19:34 -0700)]
Fix build
Change-Id: I2c97e405eaec7ee1569fcddc872ff2a98c829efe
Svet Ganov [Tue, 14 Jul 2015 01:32:17 +0000 (01:32 +0000)]
am
8cee6587: Merge "Teach storage appops." into mnc-dev
* commit '
8cee6587e0efb2d8e63f1505b057a1e328525017':
Teach storage appops.
Svet Ganov [Tue, 14 Jul 2015 01:24:34 +0000 (01:24 +0000)]
Merge "Teach storage appops." into mnc-dev
Svet Ganov [Fri, 10 Jul 2015 21:29:33 +0000 (14:29 -0700)]
Teach storage appops.
For modern apps targeting M SDK and up the external storage state
is deterined by granted permissions. For apps targeting older SDK
the storage access is determined by app ops correspning to the
storage permissions as the latter are always granted.
When app ops change we do not remount as we kill the app process
in both cases enabling and disabling an app op since legacy code
is not prepared for dynamic behavior where an operation that failed
may next succeed. Hence, we remount when we start the app.
For modern apps we don't kill the app process on a permission
grant, therefore we synchronously remount the app storage.
bug:
22104923
Change-Id: I601c19c764a74c2d15bea6630d0f5fdc52bf6a5a
Christopher Tate [Tue, 14 Jul 2015 01:18:40 +0000 (01:18 +0000)]
am
4b9b3e47: Merge "Default browser should not supersede intent filter priorities" into mnc-dev
* commit '
4b9b3e4731ffb962daf0f5029450001a8a6e7c00':
Default browser should not supersede intent filter priorities
Svet Ganov [Tue, 14 Jul 2015 01:12:15 +0000 (01:12 +0000)]
am
fc2bc7f1: Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev
* commit '
fc2bc7f170ba564bc439fd22dd5a779d96670ffd':
Check signatures of privileged persistent apps for granting defailt permissions
Christopher Tate [Tue, 14 Jul 2015 01:08:26 +0000 (01:08 +0000)]
Merge "Default browser should not supersede intent filter priorities" into mnc-dev
Christopher Tate [Tue, 14 Jul 2015 00:31:45 +0000 (17:31 -0700)]
Default browser should not supersede intent filter priorities
Bug
22304850
Change-Id: Ie4deffea2621fdc03a9bfe35690ecd109eed1a04
Christopher Tate [Tue, 14 Jul 2015 01:01:43 +0000 (01:01 +0000)]
am
288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev
* commit '
288ecf98f14c9eff639b0a3de074d5b4a06eccec':
Prioritize most-recently-enabled link-handling app
Svetoslav [Tue, 14 Jul 2015 01:01:36 +0000 (01:01 +0000)]
am
56c59d15: Merge "Fix two grant default permissions edge cases." into mnc-dev
* commit '
56c59d1550703bc96151dc53bb4b697fda6a6028':
Fix two grant default permissions edge cases.
Robert Schaub [Tue, 14 Jul 2015 01:01:30 +0000 (01:01 +0000)]
am
9de5dcac: am
70d39c28: am
2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '
9de5dcac9589d064414a2ff6f3b76dc40c1b8765':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
Svet Ganov [Tue, 14 Jul 2015 00:58:32 +0000 (00:58 +0000)]
Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev
Christopher Tate [Tue, 14 Jul 2015 00:56:55 +0000 (00:56 +0000)]
Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev
Svetoslav [Tue, 14 Jul 2015 00:54:34 +0000 (00:54 +0000)]
Merge "Fix two grant default permissions edge cases." into mnc-dev
Svetoslav [Tue, 14 Jul 2015 00:37:32 +0000 (17:37 -0700)]
Fix two grant default permissions edge cases.
1. When querying for components to which to grant default
permissions we are now getting disabled components as
well as we want such packages to get default pemrissions
on upgrade as disabled components may get reenabled.
2. When resolving activities to whose packages to grant default
permissions we skip the corss-profile and skip-profile filters
as they are set by device policy which should not affect
implicitly default permission grants. Policy has explicit
APIs for permission management.
bug:
22405963
Change-Id: Idf56d35e567a6fd6e097cd45988d1561422ee6fc
Robert Schaub [Tue, 14 Jul 2015 00:44:21 +0000 (00:44 +0000)]
am
70d39c28: am
2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '
70d39c2836f3c05a93035439df0082b5c471c010':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
Robert Schaub [Tue, 14 Jul 2015 00:26:21 +0000 (00:26 +0000)]
am
2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '
2b856100f67da1505eac30e2d989b84a2d68f20a':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
Jason Monk [Tue, 14 Jul 2015 00:15:22 +0000 (00:15 +0000)]
am
9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev
* commit '
9c2182e1b3d7a2eedb072d4ddcacb903e67b25aa':
Add a dumpsys for KeyguardUpdateMonitor
Robert Schaub [Tue, 14 Jul 2015 00:15:15 +0000 (00:15 +0000)]
am
fd186d20: am
28006a3b: am
7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '
fd186d20c53e8b0565f1360a71618710631eceeb':
docs: Changed text as requested in Android TV advertising bug, with minor cleanup
Robert Schaub [Tue, 14 Jul 2015 00:15:08 +0000 (00:15 +0000)]
am
0b403ebd: am
1962b730: am
3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '
0b403ebd6aecdf6691c4df009c791096d734aeb0':
docs: Removed parenthetic phrase that made explanation unnecessarily confusing
David Friedman [Tue, 14 Jul 2015 00:15:01 +0000 (00:15 +0000)]
am
91a44578: am
5c3bf584: am
e0f0fabb: am
ccb8a9af: am
b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit '
91a44578e4f1788cb97da79863faaa4ba7970f45':
docs: replacing command line tool instructions with Studio and Monitor steps
Eric Gilmore [Tue, 14 Jul 2015 00:14:54 +0000 (00:14 +0000)]
am
908c50a1: am
f13e914d: am
8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
* commit '
908c50a1727f546aa060b9fff1f2c648739acfee':
Adding a link to what is currently our most popular "100 Days" video.
Jinsuk Kim [Tue, 14 Jul 2015 00:14:48 +0000 (00:14 +0000)]
am
e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev
* commit '
e249eb3a6f33ee945113a8f11e8382e70c4e066f':
Perform One touch play upon pressing home key
Jason Monk [Tue, 14 Jul 2015 00:10:09 +0000 (00:10 +0000)]
Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev
Christopher Tate [Sat, 11 Jul 2015 00:44:53 +0000 (17:44 -0700)]
Prioritize most-recently-enabled link-handling app
In the case when multiple apps handle a given web-link action,
all of which have been marked as "launch the app instead of a
browser" and so are otherwise ambiguous, always prefer the app
that was most recently placed into the always-handle-links state.
Bug
22051035
Change-Id: I3f43c19b0d7b74e9843445e41971bb5433affb1c
Robert Schaub [Mon, 13 Jul 2015 23:58:09 +0000 (23:58 +0000)]
am
28006a3b: am
7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '
28006a3b31d1cd3765568ceed211f8bc8de9c50c':
docs: Changed text as requested in Android TV advertising bug, with minor cleanup
Robert Schaub [Mon, 13 Jul 2015 23:58:03 +0000 (23:58 +0000)]
am
1962b730: am
3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '
1962b730067d5b9ad9666ee3a7d1e3f90004c7d7':
docs: Removed parenthetic phrase that made explanation unnecessarily confusing
David Friedman [Mon, 13 Jul 2015 23:57:52 +0000 (23:57 +0000)]
am
5c3bf584: am
e0f0fabb: am
ccb8a9af: am
b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit '
5c3bf5847c98b23a525288ed04f77b2a68ec6870':
docs: replacing command line tool instructions with Studio and Monitor steps
Eric Gilmore [Mon, 13 Jul 2015 23:57:43 +0000 (23:57 +0000)]
am
f13e914d: am
8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
* commit '
f13e914d23a47809d978183a8e6b6ab3a5d51098':
Adding a link to what is currently our most popular "100 Days" video.
Roshan Pius [Mon, 13 Jul 2015 23:56:07 +0000 (23:56 +0000)]
am
cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev
* commit '
cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093':
Catch & log security exception in telephonymanager
Jinsuk Kim [Mon, 13 Jul 2015 23:44:58 +0000 (23:44 +0000)]
Merge "Perform One touch play upon pressing home key" into mnc-dev
Robert Schaub [Mon, 13 Jul 2015 23:41:11 +0000 (23:41 +0000)]
Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
Robert Schaub [Mon, 13 Jul 2015 23:23:48 +0000 (23:23 +0000)]
am
7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '
7182f075fad7865eb8c1ce58d90327addabc7c4b':
docs: Changed text as requested in Android TV advertising bug, with minor cleanup
Robert Schaub [Mon, 13 Jul 2015 23:23:43 +0000 (23:23 +0000)]
am
3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '
3430bec7e0b2f7a0552a66a523e478cd2ecd9043':
docs: Removed parenthetic phrase that made explanation unnecessarily confusing
Robert Schaub [Mon, 29 Jun 2015 19:37:10 +0000 (12:37 -0700)]
docs: Removed references to lockscreen widgets, added note to Android 5.0
changes page
Removed one line from source code sample as well.
Bug:
20826638
Change-Id: I3c27353db0f0092c21962f9beec1bf1da52ee9d5
Roshan Pius [Mon, 13 Jul 2015 23:17:02 +0000 (23:17 +0000)]
Merge "Catch & log security exception in telephonymanager" into mnc-dev
Robert Schaub [Mon, 13 Jul 2015 23:12:22 +0000 (23:12 +0000)]
Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
Robert Schaub [Mon, 13 Jul 2015 23:06:44 +0000 (23:06 +0000)]
Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
Amit Mahajan [Mon, 13 Jul 2015 22:21:40 +0000 (22:21 +0000)]
am
53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev
* commit '
53e5ba22c1694fad23b67d18c42c01d6deada5f6':
Do not check runtime READ_PHONE_STATE if caller has the privileged one.
Amit Mahajan [Mon, 13 Jul 2015 22:06:03 +0000 (22:06 +0000)]
Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev
John Reck [Mon, 13 Jul 2015 22:03:58 +0000 (22:03 +0000)]
am
f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
* commit '
f96d9c5421b7df1c60024a0928639e18c6d96b7b':
Improve resource loading by ~3x
John Reck [Mon, 13 Jul 2015 21:50:26 +0000 (21:50 +0000)]
Merge "Improve resource loading by ~3x" into mnc-dev
John Reck [Mon, 13 Jul 2015 21:42:43 +0000 (14:42 -0700)]
Improve resource loading by ~3x
Bug:
22392651
ColorStateLists were never cached because the lazy-create
of the constant state had a typo.
Resource caching in general was broken because ThemeKey did not
clone the hash code, so all keys in the cache had a hashCode
of 0 which did not match the real, uncloned ThemeKeys hash code
so the binary search in ArrayMap based off of hash code was failing.
Change-Id: I9df1628b226bfa797bed97875354c19bf64f41ad
Jason Monk [Mon, 13 Jul 2015 21:02:49 +0000 (17:02 -0400)]
Add a dumpsys for KeyguardUpdateMonitor
Include the info used when determining carrier text display.
Bug:
22212693
Change-Id: I12f01683c259ff11c7f27eec5d03d53f0b290d0b
Wale Ogunwale [Mon, 13 Jul 2015 20:58:45 +0000 (20:58 +0000)]
am
093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '
093d8de298c258943ca79c1cf429f5ef5725d1bb':
Finish already paused activity if it should be finished after pausing
Wale Ogunwale [Mon, 13 Jul 2015 20:49:05 +0000 (20:49 +0000)]
Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
Roshan Pius [Thu, 9 Jul 2015 21:15:25 +0000 (14:15 -0700)]
Catch & log security exception in telephonymanager
BUG:
22225068
Change-Id: I9b0053cf1041c81f409ace556b810ef79de88599
Vinit Deshpande [Mon, 13 Jul 2015 20:00:21 +0000 (20:00 +0000)]
am
0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
* commit '
0bd08fc22ae457791d95a4d557051e6601516bd0':
Fix multiple SSIDs for same Passpoint issues
Vinit Deshpande [Mon, 13 Jul 2015 19:46:25 +0000 (19:46 +0000)]
Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
Jim Miller [Mon, 13 Jul 2015 18:49:23 +0000 (18:49 +0000)]
am
16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev
* commit '
16c1764cf552432d304eaefd912d5aebe3192449':
Change MANAGE_FINGERPRINT permission to system|signature
Jim Miller [Mon, 13 Jul 2015 18:41:29 +0000 (18:41 +0000)]
Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev
Aravind Akella [Mon, 13 Jul 2015 18:35:12 +0000 (18:35 +0000)]
am
37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
* commit '
37511e35ae22ea88539f1137ea2f74c9cb17f60c':
Log full class name of the client activating sensors for better debugging.
Aravind Akella [Mon, 13 Jul 2015 18:21:34 +0000 (18:21 +0000)]
Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
Etan Cohen [Mon, 13 Jul 2015 18:16:39 +0000 (18:16 +0000)]
am
c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
* commit '
c09544bb88ada53494d4a955d0450a22985b4799':
Fix filter on CONNECTIVITY_ACTION updates
Amith Yamasani [Mon, 13 Jul 2015 18:16:32 +0000 (18:16 +0000)]
am
1578357d: Merge "Check user state after clearing identity." into mnc-dev
* commit '
1578357df737296aa151c6934fe7dd749a43ae15':
Check user state after clearing identity.
Etan Cohen [Mon, 13 Jul 2015 18:04:38 +0000 (18:04 +0000)]
Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
Amith Yamasani [Mon, 13 Jul 2015 18:03:18 +0000 (18:03 +0000)]
Merge "Check user state after clearing identity." into mnc-dev
Chris Wren [Mon, 13 Jul 2015 17:53:08 +0000 (17:53 +0000)]
am
208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
* commit '
208934ff010cc2aff7d8fee9237d6cee0e5bb563':
fix build by restoring deleted enum
Julia Reynolds [Mon, 13 Jul 2015 17:43:59 +0000 (17:43 +0000)]
am
fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
* commit '
fbd0a444e787c93ee8ef8741fcf24826a8619fcb':
Remove personal/device group from sideloading screen.
Chris Wren [Mon, 13 Jul 2015 17:41:48 +0000 (17:41 +0000)]
Merge "fix build by restoring deleted enum" into mnc-dev
Julia Reynolds [Mon, 13 Jul 2015 17:34:10 +0000 (17:34 +0000)]
Merge "Remove personal/device group from sideloading screen." into mnc-dev
Chris Wren [Mon, 13 Jul 2015 16:59:01 +0000 (12:59 -0400)]
fix build by restoring deleted enum
Bug:
21114836
Change-Id: Ied4a6e48c66f882f43343a21bce0b3ccccd81713
Jason Monk [Mon, 13 Jul 2015 16:32:32 +0000 (16:32 +0000)]
am
28a07ff0: Merge "Fix demo mode issues" into mnc-dev
* commit '
28a07ff0e1bf6029653ceaaa7bbfae0080ee05d7':
Fix demo mode issues
Chris Wren [Mon, 13 Jul 2015 16:32:25 +0000 (16:32 +0000)]
am
4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
* commit '
4502bfb8fd5ddb15bf0cc9bfc631eda269621f29':
add new enums to MetricsConstans
Jason Monk [Mon, 13 Jul 2015 16:32:19 +0000 (16:32 +0000)]
am
59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev
* commit '
59b1dfef62a041920f36c8e3e376d38facdd9c8d':
Show volume restriction toast on all users
Jason Monk [Mon, 13 Jul 2015 16:22:35 +0000 (16:22 +0000)]
Merge "Fix demo mode issues" into mnc-dev
Chris Wren [Mon, 13 Jul 2015 16:21:21 +0000 (16:21 +0000)]
Merge "add new enums to MetricsConstans" into mnc-dev
Jason Monk [Mon, 13 Jul 2015 16:21:00 +0000 (16:21 +0000)]
Merge "Show volume restriction toast on all users" into mnc-dev
Geoff Mendal [Mon, 13 Jul 2015 15:52:25 +0000 (15:52 +0000)]
am
c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c021aaaf6bd085d7332a33232e8118bab50ecc1f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:37:09 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 13 Jul 2015 15:34:33 +0000 (10:34 -0500)]
Import translations. DO NOT MERGE
Change-Id: Idab7fc2dc586c8544d17263428c5556929303a64
Auto-generated-cl: translation import
Neil Fuller [Mon, 13 Jul 2015 15:27:31 +0000 (15:27 +0000)]
am
3ecbca50: am
886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
* commit '
3ecbca5081f26ca03ef6b8b68767753343e67f38':
Switch shutdownInput / shutdownOutput to using Os.shutdown.
Neil Fuller [Mon, 13 Jul 2015 15:11:11 +0000 (15:11 +0000)]
am
886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
* commit '
886630c0d8adc17c494edf19a30b06473a687fcb':
Switch shutdownInput / shutdownOutput to using Os.shutdown.
Jason Monk [Mon, 13 Jul 2015 15:02:13 +0000 (11:02 -0400)]
Show volume restriction toast on all users
Bug:
21642285
Change-Id: I18ed4036543e1f13cd3010b9e1d790b16aa8e7a0
Neil Fuller [Mon, 13 Jul 2015 15:02:04 +0000 (15:02 +0000)]
Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
Jason Monk [Mon, 13 Jul 2015 14:42:23 +0000 (10:42 -0400)]
Fix demo mode issues
Bug:
22387423
Change-Id: I7b0b4ca75bae12a9fb3a90ab804b263e8d982b46
Rubin Xu [Mon, 13 Jul 2015 14:06:04 +0000 (14:06 +0000)]
am
cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
* commit '
cf9aebf138a3ec07277b1e5564751d2396a155c0':
Remove ExternalStorageFormatter
Rubin Xu [Mon, 13 Jul 2015 13:55:51 +0000 (13:55 +0000)]
Merge "Remove ExternalStorageFormatter" into mnc-dev
Julia Reynolds [Thu, 9 Jul 2015 19:23:42 +0000 (15:23 -0400)]
Remove personal/device group from sideloading screen.
Also ignore the requestedPermissionFlags of yet to be installed
packages when trying to determine if a permission is new.
Bug:
22229417
Change-Id: I59d579cdc42d64bcfdefdb06e1576959355bb7a4
Esteban Talavera [Mon, 13 Jul 2015 10:15:06 +0000 (10:15 +0000)]
am
0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev
* commit '
0ec43f89d2fc7064e7b42b40b318bef15fb040b5':
Use correct user when filtering app link candidates
Esteban Talavera [Mon, 13 Jul 2015 10:14:58 +0000 (10:14 +0000)]
am
22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev
* commit '
2292160320f29144f8f8f38bd6936e9f1efb4ae5':
Don't send app links to parent profile if status == never
Esteban Talavera [Mon, 13 Jul 2015 09:48:45 +0000 (09:48 +0000)]
Merge "Use correct user when filtering app link candidates" into mnc-dev
Esteban Talavera [Mon, 13 Jul 2015 09:48:18 +0000 (09:48 +0000)]
Merge "Don't send app links to parent profile if status == never" into mnc-dev
Billy Lau [Mon, 13 Jul 2015 07:21:51 +0000 (07:21 +0000)]
am
96d00ab3: Merge "Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '
96d00ab359d60197321f06b4feb3d01f3fa03a29':
Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Zhijun He [Mon, 13 Jul 2015 07:21:44 +0000 (07:21 +0000)]
am
4fb81253: Camera metadata: fix typos.
* commit '
4fb81253edc726936d4b71b7e9c0789cab45e9da':
Camera metadata: fix typos.
Geoff Mendal [Mon, 13 Jul 2015 07:21:35 +0000 (07:21 +0000)]
am
1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
1962ad3e09552af679feaad34452e164facb625b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 07:21:17 +0000 (07:21 +0000)]
am
d64ba82e: (-s ours) Import translations. DO NOT MERGE
* commit '
d64ba82e8953810dd8420e7810be016831528bed':
Import translations. DO NOT MERGE
Raph Levien [Mon, 13 Jul 2015 07:21:03 +0000 (07:21 +0000)]
am
1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
* commit '
1b3d03512e7bc759d3cd340280d7a5c59195a063':
Improve Html.toHtml() documentation
Amith Yamasani [Mon, 13 Jul 2015 07:20:52 +0000 (07:20 +0000)]
am
292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev
* commit '
292eb65f1ee0747e60899c1b1d0b6cb16c9cd37a':
Fix new user creation regression due to vold remount calls
Amith Yamasani [Mon, 13 Jul 2015 07:20:42 +0000 (07:20 +0000)]
am
5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev
* commit '
5449ee078620255ce9bea60c0a4dbece36e6acf9':
Avoid IPC call with an empty array
Sanket Padawe [Mon, 13 Jul 2015 07:20:33 +0000 (07:20 +0000)]
am
233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
* commit '
233bd3ceffbe247b5230f2832ad63c6cf1d9ed13':
Changes security for Passpoint to EAP security from "Passpoint".
Adrian Roos [Mon, 13 Jul 2015 07:20:21 +0000 (07:20 +0000)]
am
d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev
* commit '
d374c20fc9269913d19666f0994268ed457e0d42':
Fix flash of uninitialized surface
Carlos Valdivia [Mon, 13 Jul 2015 07:20:11 +0000 (07:20 +0000)]
am
97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev
* commit '
97cf0f1d76f1747302e0171c1cd4f0655fde99c4':
Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
Mady Mellor [Mon, 13 Jul 2015 07:19:59 +0000 (07:19 +0000)]
am
1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev
* commit '
1c277ca8cd699b15e631342775d996404a75e660':
Fix: line slop shouldn't always increase / decrease by one line
Mady Mellor [Mon, 13 Jul 2015 07:19:50 +0000 (07:19 +0000)]
am
a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev
* commit '
a9f07ccf38709be29137dec246bca7fea976a294':
Fix line slop issue at end of line for Thai & CJK
Wale Ogunwale [Mon, 13 Jul 2015 07:19:24 +0000 (07:19 +0000)]
am
26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev
* commit '
26b0f1e420c0590ea5e9c506f4f14ba4b0a873f0':
Revert "Finish already paused activity if it should be finished after pausing"
John Reck [Mon, 13 Jul 2015 07:19:17 +0000 (07:19 +0000)]
am
8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev
* commit '
8657d9e8a56af7847578b65a881016da985b3531':
JNI optimization tweaks to Paint high-frequency methods
Chris Craik [Mon, 13 Jul 2015 07:19:10 +0000 (07:19 +0000)]
am
9f004920: Merge "Reduce cost of span type checking" into mnc-dev
* commit '
9f0049200824ae523a6cd39b9866c709d42e3075':
Reduce cost of span type checking
Wale Ogunwale [Sun, 12 Jul 2015 22:14:01 +0000 (15:14 -0700)]
Finish already paused activity if it should be finished after pausing
If the app requests its activity to be finished allow it to be finished
immediately if the activity is already paused.
Also, don't schedule stop for an activity that was already finished in
ActivityStack.stopActivityLocked().
Bug:
22170595
Bug:
22397812
Change-Id: If349f7d3070a1fd2c0688fda7381b42f625ed9e4
OSDN Git Service
