OSDN Git Service
Philip P. Moltmann [Tue, 14 Feb 2017 17:43:23 +0000 (09:43 -0800)]
resolve merge conflicts of
d043a840f7f12ce2c54e7d4564a6ac9cfa24dd17 to nyc-mr2-dev-plus-aosp
Test: Clean merge
Change-Id: Ib2420ff793fdf22fd80cfaed7848ff6b8be8d382
Orion Hodson [Tue, 14 Feb 2017 16:20:31 +0000 (16:20 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am:
3023906b1b am:
49e0cad3e1
am:
4105747ec3
Change-Id: Id6a920af9c5f506d4e25cb05294877f9a7043aaa
Orion Hodson [Tue, 14 Feb 2017 16:14:08 +0000 (16:14 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am:
3023906b1b
am:
49e0cad3e1
Change-Id: I16775763cb63e18d35765b807acb91fc57286b85
Orion Hodson [Tue, 14 Feb 2017 16:07:28 +0000 (16:07 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
am:
3023906b1b
Change-Id: If332034df3b7afac1f7fdb92ca40adfb420ba768
Philip P. Moltmann [Tue, 14 Feb 2017 16:03:27 +0000 (16:03 +0000)]
Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"" into nyc-mr2-dev
Orion Hodson [Tue, 14 Feb 2017 16:02:32 +0000 (16:02 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
Manu Cornet [Tue, 14 Feb 2017 15:30:21 +0000 (15:30 +0000)]
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev
am:
f47658f120
Change-Id: I664be0dd3e1f2e6cf2d7dc94613b0efcaf6887a9
TreeHugger Robot [Tue, 14 Feb 2017 15:24:42 +0000 (15:24 +0000)]
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev
songjinshi [Tue, 14 Feb 2017 14:39:14 +0000 (14:39 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue." am:
d530d1bf18 am:
f69a73793d
am:
d0e81464bd
Change-Id: I8a2f552e3fa500f14e1912acbbbade3ea510715f
songjinshi [Tue, 14 Feb 2017 14:34:13 +0000 (14:34 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue." am:
d530d1bf18
am:
f69a73793d
Change-Id: Ifcce0699f9434cf490f9b4b596ba7604208275c6
songjinshi [Tue, 14 Feb 2017 14:29:36 +0000 (14:29 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
am:
d530d1bf18
Change-Id: I661207bb52d84b1928d7ff3ad262cfe89e71e60b
Treehugger Robot [Tue, 14 Feb 2017 14:23:18 +0000 (14:23 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
Erik Kline [Tue, 14 Feb 2017 09:49:56 +0000 (09:49 +0000)]
Merge "Verify duplicate upstream notifications are ignored" am:
3d57eb0bdc am:
02e71f6245
am:
8055dafb08
Change-Id: I1e10adfba2ebb9f52e86d8b35f3d0b87134c0e91
Erik Kline [Tue, 14 Feb 2017 09:45:56 +0000 (09:45 +0000)]
Merge "Verify duplicate upstream notifications are ignored" am:
3d57eb0bdc
am:
02e71f6245
Change-Id: I0e62e4f6f371aa43eae1a0e5c62787c4e84ddd9a
Erik Kline [Tue, 14 Feb 2017 09:41:53 +0000 (09:41 +0000)]
Merge "Verify duplicate upstream notifications are ignored"
am:
3d57eb0bdc
Change-Id: Iff84a1a12714047b20408f03e3bb2252a463b74b
Treehugger Robot [Tue, 14 Feb 2017 09:32:55 +0000 (09:32 +0000)]
Merge "Verify duplicate upstream notifications are ignored"
Erik Kline [Tue, 14 Feb 2017 06:55:00 +0000 (15:55 +0900)]
Verify duplicate upstream notifications are ignored
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32163131
Change-Id: I3c097d766fe4c416a8e3f02640809fe1199c6ef2
Erik Kline [Tue, 14 Feb 2017 06:25:47 +0000 (06:25 +0000)]
Merge "Cleanup in the face of upstream error" am:
ed6d75d5f3 am:
76e6f790db
am:
663ec79cb2
Change-Id: Ib726fe85b816eccbc0beab555873b77f3454bc64
Erik Kline [Tue, 14 Feb 2017 06:21:44 +0000 (06:21 +0000)]
Merge "Cleanup in the face of upstream error" am:
ed6d75d5f3
am:
76e6f790db
Change-Id: I097318f3edc5257288d582a0f17744e1f984856c
Erik Kline [Tue, 14 Feb 2017 06:17:38 +0000 (06:17 +0000)]
Merge "Cleanup in the face of upstream error"
am:
ed6d75d5f3
Change-Id: If8dbf882bd8c4a8d53ae026d8f83a00a52590830
Erik Kline [Tue, 14 Feb 2017 06:09:21 +0000 (06:09 +0000)]
Merge "Cleanup in the face of upstream error"
Badhri Jagan Sridharan [Tue, 14 Feb 2017 03:40:33 +0000 (03:40 +0000)]
Merge changes from topic 'pixel-c' into nyc-mr2-dev
am:
dee514fae3
Change-Id: I4038d1fbd429fcedc4a379d764b5ef5c59dcce1d
TreeHugger Robot [Tue, 14 Feb 2017 03:34:48 +0000 (03:34 +0000)]
Merge changes from topic 'pixel-c' into nyc-mr2-dev
* changes:
Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]
Fix handling usb dialog for wall chargers. [DO NOT MERGE]
Erik Kline [Mon, 13 Feb 2017 08:28:53 +0000 (17:28 +0900)]
Cleanup in the face of upstream error
If either enableNat() or startInterfaceForwarding() fail, be sure
to cleanup any commands that might have succeeded.
Most of this change is a refactoring of cleanupUpstreamIface() into
two methods, one of which (cleanupUpstreamInterface()) is reused
in error handling scenarios.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32031803
Bug:
32163131
Change-Id: Ia4d56e03beeab1908d8b8c2202e94992f1aa58a4
Ningyuan Wang [Tue, 14 Feb 2017 02:28:30 +0000 (02:28 +0000)]
Merge "Create createFromByteArray() for WifiSsid" am:
fb19d8d7c1 am:
18b3a7f586
am:
9d1be09462
Change-Id: If221ae36424377501677f70a3601509328268604
Ningyuan Wang [Tue, 14 Feb 2017 02:24:30 +0000 (02:24 +0000)]
Merge "Create createFromByteArray() for WifiSsid" am:
fb19d8d7c1
am:
18b3a7f586
Change-Id: Iea1e8282f0a9d2b58d48ab67dd856fafce95daf0
Ningyuan Wang [Tue, 14 Feb 2017 02:20:23 +0000 (02:20 +0000)]
Merge "Create createFromByteArray() for WifiSsid"
am:
fb19d8d7c1
Change-Id: I8b88c2259950b81b452452a2b56fd0ceaf2b7180
Ningyuan Wang [Tue, 14 Feb 2017 02:13:33 +0000 (02:13 +0000)]
Merge "Create createFromByteArray() for WifiSsid"
Chen Xu [Tue, 14 Feb 2017 01:46:33 +0000 (01:46 +0000)]
Merge "Add simActivationState to PhoneStateListener" am:
132842efc9 am:
b206f5b382
am:
60ca278b7f
Change-Id: I13a38eb6094899e396d079e13e07e15d1cb5ca98
Badhri Jagan Sridharan [Fri, 10 Feb 2017 03:45:21 +0000 (19:45 -0800)]
Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]
Type-c ports can quickly toggle between connected/disconnected
states. Introduce debounce to prevent sending spurious notifications.
Bug:
34972898
Test: notification should not be queued for a pixel-c charger not connected
to the power outlet.
Change-Id: I4aa19f9f864fe5b77e65f6a07a3184d8aba1f5fc
Badhri Jagan Sridharan [Mon, 13 Feb 2017 21:14:40 +0000 (13:14 -0800)]
Fix handling usb dialog for wall chargers. [DO NOT MERGE]
UsbPort.POWER_ROLE_SINK is orthogonal to the type of the charger
attached. POWER_ROLE_SINK would be the case for AC charging and
USB charging. Therefore query BatteryManager for the charger
type.
Bug:
34972898
Test: Charging notification should not show for pixel-c chargers.
Change-Id: I8dddcd7727b6af973bd173d2c6e325aa4be2ca3a
Chen Xu [Tue, 14 Feb 2017 01:42:00 +0000 (01:42 +0000)]
Merge "Add simActivationState to PhoneStateListener" am:
132842efc9
am:
b206f5b382
Change-Id: I3feca80a72ee4a7ef3fe1583aa563451b91a68f4
Chen Xu [Tue, 14 Feb 2017 01:34:02 +0000 (01:34 +0000)]
Merge "Add simActivationState to PhoneStateListener"
am:
132842efc9
Change-Id: I0b35d7d8f5b6237ff55aaab0cab0b86d75699a7a
Chen Xu [Tue, 14 Feb 2017 01:26:18 +0000 (01:26 +0000)]
Merge "Add simActivationState to PhoneStateListener"
Android Build Merger (Role) [Tue, 14 Feb 2017 01:10:21 +0000 (01:10 +0000)]
Merge "Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5 am:
c510e19d18 am:
ee37330dff" into nyc-mr2-dev-plus-aosp
Amith Yamasani [Tue, 14 Feb 2017 01:09:39 +0000 (01:09 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5 am:
c510e19d18
am:
ee37330dff
Change-Id: I9f75a9309a91de3a6145861189534c8ab10ca6f3
Amith Yamasani [Tue, 14 Feb 2017 01:07:53 +0000 (01:07 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5 am:
c510e19d18
am:
67dbaa8a14
Change-Id: Ie554aec3a777468b8dc7da731337ffbdb2851846
Amith Yamasani [Tue, 14 Feb 2017 01:02:54 +0000 (01:02 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5
am:
c510e19d18
Change-Id: I532b675a10ae9e21f28f3aa38d0f2e85ac080faa
Amith Yamasani [Tue, 14 Feb 2017 01:02:53 +0000 (01:02 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5
am:
c510e19d18
Change-Id: I367d15ea4ab849ee16e58d08793dc7971304740f
Android Build Merger (Role) [Tue, 14 Feb 2017 01:01:10 +0000 (01:01 +0000)]
Merge "Merge "Only modify window layout params when necessary." into cw-f-dev am:
9fbd981f23 am:
d56887f8fa" into nyc-mr2-dev-plus-aosp
Michael Kwan [Tue, 14 Feb 2017 01:00:27 +0000 (01:00 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev am:
9fbd981f23
am:
d56887f8fa
Change-Id: I6e3695c245ed6afb208c0bd422b0ed2ac840281f
Michael Kwan [Tue, 14 Feb 2017 01:00:23 +0000 (01:00 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev am:
9fbd981f23
am:
a26e371c9b
Change-Id: I72bf9b5fa5dfaaa7573115ed5b6cca23a0be05f4
Amith Yamasani [Tue, 14 Feb 2017 00:57:56 +0000 (00:57 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
am:
7556690cf5
Change-Id: Ib0446301e56751f6a72403155c576516cd7e559c
Michael Kwan [Tue, 14 Feb 2017 00:55:32 +0000 (00:55 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
am:
9fbd981f23
Change-Id: I36aa427a3023dcba2a29eccfc0b7aac43748e534
Michael Kwan [Tue, 14 Feb 2017 00:55:29 +0000 (00:55 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
am:
9fbd981f23
Change-Id: I14316841b80bdb25755e174528ef4bb271d3e005
TreeHugger Robot [Tue, 14 Feb 2017 00:49:41 +0000 (00:49 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 14 Feb 2017 00:48:16 +0000 (00:48 +0000)]
Merge "DO NOT MERGE - Check exported status in chooser am:
7bae18232e am:
45fa749c5a" into nyc-mr2-dev-plus-aosp
Michael Kwan [Tue, 14 Feb 2017 00:48:10 +0000 (00:48 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
Hakan Seyalioglu [Tue, 14 Feb 2017 00:47:27 +0000 (00:47 +0000)]
DO NOT MERGE - Check exported status in chooser am:
7bae18232e
am:
45fa749c5a
Change-Id: Ie308e49d410863c643c13256076a3ed83c934adc
Hakan Seyalioglu [Tue, 14 Feb 2017 00:47:25 +0000 (00:47 +0000)]
DO NOT MERGE - Check exported status in chooser am:
7bae18232e
am:
aeb1f1241e
Change-Id: Ibdc23df2da0b8ea387f54169224e467a37466cff
Hakan Seyalioglu [Tue, 14 Feb 2017 00:41:55 +0000 (00:41 +0000)]
DO NOT MERGE - Check exported status in chooser
am:
7bae18232e
Change-Id: Id29e65bd455c704738618f1dacfcad53b8d0b773
Hakan Seyalioglu [Tue, 14 Feb 2017 00:41:51 +0000 (00:41 +0000)]
DO NOT MERGE - Check exported status in chooser
am:
7bae18232e
Change-Id: Ieda18baab005a6a85b5107dfab37d20dec990110
Philip P. Moltmann [Mon, 13 Feb 2017 20:59:21 +0000 (20:59 +0000)]
[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"
This reverts commit
2fc44947dd4f45a23c56985d4c12f01332027a9f.
Bug:
30662828
Change-Id: Ia22343c19e155555dff3b0cb58f7b58df0ce6301
Ningyuan Wang [Mon, 13 Feb 2017 19:26:15 +0000 (11:26 -0800)]
Create createFromByteArray() for WifiSsid
Bug:
35318006
Test: compile, unit tests
Change-Id: I0138bd67c0dec37419897318401b18ee4445a111
Hakan Seyalioglu [Mon, 30 Jan 2017 19:14:48 +0000 (11:14 -0800)]
DO NOT MERGE - Check exported status in chooser
Relevant change in master is ag/
1844170
bug:
34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
(cherry picked from commit
e3286c3145d54564e783333ac2a2bb89b9ffdc49)
Amith Yamasani [Mon, 13 Feb 2017 21:59:14 +0000 (21:59 +0000)]
DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."
Reason: Breaking setting the user avatar in Settings.
Bug:
35158271
This reverts commit
b61338ecb307a2f595a8f78e290b5287a6503aaa.
Change-Id: Ia08c12be3da06b0d02e71635b46350c8ff50ec19
Michael Kwan [Sat, 11 Feb 2017 02:38:34 +0000 (18:38 -0800)]
Only modify window layout params when necessary.
Cancelling swipe-to-dismiss will trigger a check to ensure the window
is reset to its original state. Ensure that the reset is actually
required before setting the new layout attributes.
Bug:
34816397
Change-Id: Idf26ce7c8b63dc44a76effefcb32eb8d8665f605
Bryan Mawhinney [Mon, 13 Feb 2017 20:54:11 +0000 (20:54 +0000)]
Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev
am:
5de3e5ab36
Change-Id: Icb15885a9ffb763dac1acf4db4685b3c8dcb5ac5
TreeHugger Robot [Mon, 13 Feb 2017 20:49:50 +0000 (20:49 +0000)]
Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev
Peter Qiu [Mon, 13 Feb 2017 20:12:20 +0000 (20:12 +0000)]
Merge "hotspot2: fix typo in the getter functions" am:
d3146f3c3c am:
5644c190a0
am:
1b510ecff7
Change-Id: I56f99259149adb6a5e2fda7e2bbf8093a528a675
Bryan Mawhinney [Mon, 13 Feb 2017 20:09:34 +0000 (20:09 +0000)]
Merge "Workaround wallpaper restore race" into nyc-mr2-dev
am:
29e3920c4e
Change-Id: Ida5a953e75c326a1b5f555c820d807e7cb91b797
Peter Qiu [Mon, 13 Feb 2017 20:07:16 +0000 (20:07 +0000)]
Merge "hotspot2: fix typo in the getter functions" am:
d3146f3c3c
am:
5644c190a0
Change-Id: Idac3a70dc9c8a10e82076014078d7b5af3acac72
TreeHugger Robot [Mon, 13 Feb 2017 20:04:08 +0000 (20:04 +0000)]
Merge "Workaround wallpaper restore race" into nyc-mr2-dev
Peter Qiu [Mon, 13 Feb 2017 20:02:06 +0000 (20:02 +0000)]
Merge "hotspot2: fix typo in the getter functions"
am:
d3146f3c3c
Change-Id: I8fc4042c26f896d899c090dd7afbe16a44d431eb
Treehugger Robot [Mon, 13 Feb 2017 19:49:50 +0000 (19:49 +0000)]
Merge "hotspot2: fix typo in the getter functions"
Android Build Merger (Role) [Mon, 13 Feb 2017 19:39:27 +0000 (19:39 +0000)]
Merge "Add tweaks to smooth out swipe to dismiss. am:
5758a9a94c am:
ddc6e0b7ae" into nyc-mr2-dev-plus-aosp
Michael Kwan [Mon, 13 Feb 2017 19:38:34 +0000 (19:38 +0000)]
Add tweaks to smooth out swipe to dismiss. am:
5758a9a94c
am:
ddc6e0b7ae
Change-Id: I5423d0aae6666e0b6d3b51e986e969cf108c332c
Michael Kwan [Mon, 13 Feb 2017 19:38:32 +0000 (19:38 +0000)]
Add tweaks to smooth out swipe to dismiss. am:
5758a9a94c
am:
2155f773db
Change-Id: Iab07b13f24b7ca32b6bbb6faf788a71fccb969ec
Michael Kwan [Mon, 13 Feb 2017 19:32:35 +0000 (19:32 +0000)]
Add tweaks to smooth out swipe to dismiss.
am:
5758a9a94c
Change-Id: I64b9e88a7efb164b0e0160f8b25f770fb986efd6
Michael Kwan [Mon, 13 Feb 2017 19:32:29 +0000 (19:32 +0000)]
Add tweaks to smooth out swipe to dismiss.
am:
5758a9a94c
Change-Id: Id10a31504aa5a579e8670e7a23d2d99a990ed6e5
Bryan Mawhinney [Tue, 7 Feb 2017 15:18:07 +0000 (15:18 +0000)]
Workaround wallpaper restore race
If WallpaperManager is asked to read a wallpaper between when we
call mWm.clear and mWm.setStream, it is possible for us to end
up losing restored state such as cropHint and allowBackup
By not calling mWm.clear, we make this much less likely to happen.
It isn't necessary to call clear, as will explicitly overwrite
all the interesting state anyway.
Test: by repeated adb restore
Bug:
34760753
Change-Id: I2750695d5dd16077b47b5b8fca3a667b98cc4f6c
(cherry picked from commit
5c14853296172fe9885eee26d86351bd935e8430)
Bryan Mawhinney [Tue, 7 Feb 2017 15:27:19 +0000 (15:27 +0000)]
Fix live wallpaper not showing on lock screen after restore
A recent change in nyc-mr2 means that setWallpaperComponent will
promote any static system wallpaper to the lock screen. If we don't
actually have a static lock wallpaper to restore, we need to explicitly
clear the lock wallpaper to have the live one show through
Test: manually using adb backup / restore
Bug:
35090402
Change-Id: I8a2c5ffbaefe172c9d78a9f746ab87d9bc6b7448
(cherry picked from commit
96eb5b724bab31125e15eef2c926f6648567c3a1)
Bill Yi [Mon, 13 Feb 2017 17:56:48 +0000 (17:56 +0000)]
Import translations. DO NOT MERGE
am:
c342666ac8 -s ours
Change-Id: I039290ce49b857b35f9c83177a32e0195c267d36
Bill Yi [Mon, 13 Feb 2017 14:10:54 +0000 (06:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3355bb35c1500306ddaf5102f82beb010b67c208
Auto-generated-cl: translation import
Erik Kline [Mon, 13 Feb 2017 12:08:11 +0000 (12:08 +0000)]
Merge "Add test coverage for cleanup bug to be fixed." am:
89e6bf0532 am:
0cca15ff88
am:
3de5971b40
Change-Id: I470c481a0eebc9cadf134c73ece08803927f4ca2
Erik Kline [Mon, 13 Feb 2017 12:02:48 +0000 (12:02 +0000)]
Merge "Add test coverage for cleanup bug to be fixed." am:
89e6bf0532
am:
0cca15ff88
Change-Id: Ib5d1a6d6616b99a9e4f7cf0286ebc0a11d62bff8
Erik Kline [Mon, 13 Feb 2017 11:57:37 +0000 (11:57 +0000)]
Merge "Add test coverage for cleanup bug to be fixed."
am:
89e6bf0532
Change-Id: I33347c8fc2bec5660b8e9c14a316f6d14a6cf8b1
Treehugger Robot [Mon, 13 Feb 2017 11:51:20 +0000 (11:51 +0000)]
Merge "Add test coverage for cleanup bug to be fixed."
Erik Kline [Mon, 13 Feb 2017 08:12:02 +0000 (17:12 +0900)]
Add test coverage for cleanup bug to be fixed.
The test calls that need to pass but do not currently are commented out.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32031803
Bug:
32163131
Change-Id: I68ed476920bef882f353d8e8a54c72120bc27002
fionaxu [Mon, 14 Nov 2016 21:32:14 +0000 (13:32 -0800)]
Add simActivationState to PhoneStateListener
- new public SimActivationState
- hook with PhoneStateListener, notifying registrants when voice&data
activation state changed
Bug:
31061369
Test: existing TC runtest --path frameworks/opt/telephony/tests/telephonytests
Test: new TC runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/SimActivationTrackerTest.java
Merged-in: CHANGE-ID Ieefe2698fe6055a980d225f5ce74f52aef0daab4
Change-Id: Iac6418f66c9dad44dc7272ab19aa87f3eef232f8
Michael Kwan [Sun, 12 Feb 2017 21:43:45 +0000 (13:43 -0800)]
Add tweaks to smooth out swipe to dismiss.
Bug:
34673753
Change-Id: I5a9d420c70d124fc764803d505291e66818b1aa2
(cherry picked from commit
2e11adaac3ec959044e8154c67b6ab9cde82fdab)
Android Build Merger (Role) [Sun, 12 Feb 2017 10:31:41 +0000 (10:31 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763 am:
62314d7dd3 am:
41c9029be0" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Sun, 12 Feb 2017 10:30:58 +0000 (10:30 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763 am:
62314d7dd3
am:
41c9029be0
Change-Id: I491c4ae2b64e2a15a626bc20a8e2083e0bb6a91d
Jeff Sharkey [Sun, 12 Feb 2017 10:30:50 +0000 (10:30 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763 am:
62314d7dd3
am:
8100f549bf
Change-Id: Icb69b7af8a1e7c9c2fb8c2ea47e41932006128d8
Jeff Sharkey [Sun, 12 Feb 2017 10:26:57 +0000 (10:26 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763
am:
62314d7dd3
Change-Id: Iba461adcfafc41128bc4cd33f934830c7a92ae65
Jeff Sharkey [Sun, 12 Feb 2017 10:26:51 +0000 (10:26 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763
am:
62314d7dd3
Change-Id: I1eca65886210f095a29125506422a846ae6567f9
Jeff Sharkey [Sun, 12 Feb 2017 10:22:43 +0000 (10:22 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc
am:
55ef8ba763
Change-Id: Ie2f9e943501b62177b23b701a9eea219a1dc696f
Android Build Merger (Role) [Sun, 12 Feb 2017 10:21:33 +0000 (10:21 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b am:
86f242b071 am:
d491410316" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Sun, 12 Feb 2017 10:20:52 +0000 (10:20 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b am:
86f242b071
am:
d491410316
Change-Id: If549125c9057964da34ab178af08e926962dd1d5
Jeff Sharkey [Sun, 12 Feb 2017 10:20:41 +0000 (10:20 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b am:
86f242b071
am:
5b49be4488
Change-Id: I576f71a635e1d1da44506b4e10ea7d915f5e7ba5
Jeff Sharkey [Sun, 12 Feb 2017 10:18:15 +0000 (10:18 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a
am:
ab296986fc
Change-Id: Idd20eb270f3824840900b60a0b507b3c135ddc9e
Jeff Sharkey [Sun, 12 Feb 2017 10:16:12 +0000 (10:16 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b
am:
86f242b071
Change-Id: Iec17b7e2b1dcc972951e71d3c0d9e12d03440e88
Jeff Sharkey [Sun, 12 Feb 2017 10:16:12 +0000 (10:16 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b
am:
86f242b071
Change-Id: Iaf37416af9d8d3e31b1825719f2f0cc8e860a603
Jeff Sharkey [Sun, 12 Feb 2017 10:14:09 +0000 (10:14 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours
am:
9aca89293a
Change-Id: Ifc71c14cbdfe8e93cb6bca789daa17117b8f214f
Jeff Sharkey [Sun, 12 Feb 2017 10:12:11 +0000 (10:12 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4
am:
c7b754f62b
Change-Id: Icc3179df0206649ca412eb3cb4a8b5a4691718fb
Jeff Sharkey [Sun, 12 Feb 2017 10:10:13 +0000 (10:10 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4
am:
208dcadb4f -s ours
Change-Id: If13e06378379077bbf25e6accc35951c26703a9c
Jeff Sharkey [Sun, 12 Feb 2017 10:08:11 +0000 (10:08 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359
am:
853e178de4
Change-Id: I7adf093b7b09d6cc69e13f17865f754ccf327200
Jeff Sharkey [Sun, 12 Feb 2017 10:06:34 +0000 (10:06 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0
am:
9335807fc4
Change-Id: I66766f7b8feccdf1855b3819ca30cec5b480ef07
Jeff Sharkey [Sun, 12 Feb 2017 10:04:10 +0000 (10:04 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours
am:
deea677359
Change-Id: I579175736bf9c3839492e67d08b8ce765c85c121
Jeff Sharkey [Sun, 12 Feb 2017 10:02:08 +0000 (10:02 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a
am:
00f5232dd0
Change-Id: I535ba4091bcb29fc25fc640f938a483b829e15c2
OSDN Git Service
