OSDN Git Service
Mark Goldstein [Fri, 27 May 2016 18:09:42 +0000 (18:09 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb am:
f9d8f6c5f3
am:
7f1330358a
* commit '
7f1330358ac8037e440f0a66f9abed0f5db0481f':
Doc change: Fix broken link.
Change-Id: I5234b90d962f485510c0395b116b9565c58cf7ab
Mark Goldstein [Fri, 27 May 2016 17:57:50 +0000 (17:57 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs am:
d643ab1ddb
am:
f9d8f6c5f3
* commit '
f9d8f6c5f36b07961f2d38b43c991ed679022f7e':
Doc change: Fix broken link.
Change-Id: Iee76c1e357f2c67362d951f567bc3498c208fb35
Jaewan Kim [Fri, 27 May 2016 17:46:48 +0000 (17:46 +0000)]
Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev
am:
f8c504db7f
* commit '
f8c504db7f2e0e35c5fa19cad46681dc17db7488':
PIP: Improve PIP control row's focus change animation in Recents
Change-Id: I55e62b5a1ba5290b4167c895707cf360b97b042a
Mark Goldstein [Fri, 27 May 2016 17:46:38 +0000 (17:46 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs
am:
d643ab1ddb
* commit '
d643ab1ddb737aeb6636c61839cb64bdc7348c04':
Doc change: Fix broken link.
Change-Id: Ia1a9fdd18486ecf34d4a577f0e7f9d9570f748a3
Jason Monk [Fri, 27 May 2016 17:46:38 +0000 (17:46 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev
am:
4f620d423f
* commit '
4f620d423f82dd43ed79178e0091132dd49ca2a9':
QS: Handle detail scroll properly
Change-Id: I6c3023fc9a6053b5918a22fff9f9af577df48c43
Mark Goldstein [Fri, 27 May 2016 17:37:36 +0000 (17:37 +0000)]
Merge "Doc change: Fix broken link." into mnc-io-docs
TreeHugger Robot [Fri, 27 May 2016 17:36:42 +0000 (17:36 +0000)]
Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev
Chris Wren [Fri, 27 May 2016 17:34:02 +0000 (13:34 -0400)]
resolve merge conflicts of
cd9ea74 to nyc-mr1-dev
Change-Id: I37bc8256b8b91274f418cbefe2797f068cd98dd4
Jae Seo [Fri, 27 May 2016 17:23:57 +0000 (17:23 +0000)]
Merge "PIP: Improve PIP control row's focus change animation in Recents" into nyc-dev
Makoto Onuki [Fri, 27 May 2016 17:21:51 +0000 (17:21 +0000)]
Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev
Julia Reynolds [Fri, 27 May 2016 16:59:32 +0000 (16:59 +0000)]
Merge "Announce upcoming tile state on click." into nyc-dev
am:
293c967667
* commit '
293c96766727517b5a94008a43d308a6d990faea':
Announce upcoming tile state on click.
Change-Id: Ied45168428e0b1945ce6613ff0be40666c1f97dc
Jason Monk [Fri, 27 May 2016 16:51:47 +0000 (16:51 +0000)]
Merge "QS: Handle detail scroll properly" into nyc-dev
TreeHugger Robot [Fri, 27 May 2016 16:49:56 +0000 (16:49 +0000)]
Merge "add metrics for gestural notification expansions" into nyc-dev
Julia Reynolds [Fri, 27 May 2016 16:48:24 +0000 (16:48 +0000)]
Merge "Announce upcoming tile state on click." into nyc-dev
Makoto Onuki [Tue, 17 May 2016 21:52:19 +0000 (14:52 -0700)]
ShortcutManager: Support manifest shortcuts
- Now apps can publish shortcuts via AndroidManifest.xml
(Sample: I5b127150)
- Rename some APIs per API council feedback
- Publishers can now "disable" shortcuts.
(https://docs.google.com/presentation/d/1raUn1QBURDb1yrd6mSmVxII9ezNh3MWukODdtufJ29U/edit#slide=id.g13ef592464_7_39)
Bug
28785283
Bug
28536066
Change-Id: I4a126841e43e40139bb4baa6d0f98ad7b3a75ac1
Ruchi Kandoi [Fri, 27 May 2016 16:28:03 +0000 (16:28 +0000)]
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev
am:
7730e57dc6
* commit '
7730e57dc6624a66cdc35260f855a467fadc7b04':
PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()
Change-Id: If4934466722851e9c7ca1443cae3e31f2b25c6c7
Amith Yamasani [Fri, 27 May 2016 15:57:38 +0000 (15:57 +0000)]
Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""
Added the missing import.
This reverts commit
c51e725644be6d46e25c29e8774b542d52c29400.
Change-Id: Icd63619a12e10dee628e568a6200d429a9936cf0
Ruchi Kandoi [Fri, 27 May 2016 16:20:42 +0000 (16:20 +0000)]
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev
Paul Jensen [Fri, 27 May 2016 15:03:48 +0000 (15:03 +0000)]
Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev
am:
83e50327fc
* commit '
83e50327fcf24e4d17a341cc2efaafc95046a8f9':
Don't drop IPv4 broadcast packets when WiFi multicast lock is held
Change-Id: Ib76e96a84820fa36357d820ef6845f6155ec902c
Julia Reynolds [Fri, 27 May 2016 15:01:55 +0000 (11:01 -0400)]
Announce upcoming tile state on click.
Change-Id: Ib804b5db13bbee07c6d45e8aa077cac60e28efb2
Fixes:
28964765
TreeHugger Robot [Fri, 27 May 2016 14:58:47 +0000 (14:58 +0000)]
Merge "Don't drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev
Jason Monk [Fri, 27 May 2016 14:47:51 +0000 (10:47 -0400)]
QS: Handle detail scroll properly
Add custom scrollview that ensures the touches can cause a scroll.
Change-Id: Ib18ac24ded11d06f59f582248964bd697652c192
Fixes:
28671167
Ivan Podogov [Fri, 27 May 2016 14:04:44 +0000 (14:04 +0000)]
Merge "Set the sensor batch size for accelerometer listener." into nyc-mr1-dev
Paul Jensen [Thu, 26 May 2016 13:16:11 +0000 (09:16 -0400)]
Don't drop IPv4 broadcast packets when WiFi multicast lock is held
IPv4 broadcast packets can be very common (e.g. every 2s) so they
need to be dropped in the general case. They also may be critical
for certain discovery protocols, so allow them through with APF
when the WiFi multicast lock is held.
Bug:
26238573
Change-Id: I03e09a2b9c779da5da775e78b95e9e0339720eaf
Ivan Podogov [Fri, 27 May 2016 12:47:20 +0000 (13:47 +0100)]
Set the sensor batch size for accelerometer listener.
For the Wear devices it is important to set the batch size here,
because otherwise all sensor-related services (like gesture detection
or gaze/ungaze detection start to consume ~10x CPU time).
Bug:
28995481
Change-Id: I30f9e5f7ea5aee8fdd80734588386e64b874e1dc
Lorenzo Colitti [Fri, 27 May 2016 10:00:00 +0000 (10:00 +0000)]
Merge "Restore DHCP client logging." into nyc-dev
am:
0f8529236e
* commit '
0f8529236eaafdda20c730214b05fe8580a380fa':
Restore DHCP client logging.
Change-Id: Ib7dd947192f749f8d5e9fc6e1b366a11a83caefa
TreeHugger Robot [Fri, 27 May 2016 09:53:48 +0000 (09:53 +0000)]
Merge "Restore DHCP client logging." into nyc-dev
Jaewan Kim [Mon, 16 May 2016 13:06:46 +0000 (22:06 +0900)]
PIP: Improve PIP control row's focus change animation in Recents
This includes following changes for performance
1. Passes the key events directly between the windows instead of using
dummy Views and OnFocusChangeListener to prevent main thread from
handling unnecessary focus changes.
2. Limits the window size for PIP controls to reduce unnecessary draw.
Here's the test result. Test is performed with paused PIP video
1. 5 visible recents task
Focus down: 48.14 fps -> 85.396 fps (+77.39%)
Focus up: 24.67 fps -> 45.33 fps (+83.77%)
2. 3 visible recents task
Focus down: 51.98 fps -> 132.72 fps (+155.34%)
Focus up: 30.91 fps -> 53.38 fps (+72.69%)
Bug:
28042495
Change-Id: I363232176975b160e122748c9997ef4b46b73a28
Lorenzo Colitti [Fri, 27 May 2016 04:59:57 +0000 (13:59 +0900)]
Restore DHCP client logging.
Bug:
28955598
Change-Id: I2e2684a787061612471830e4d840ce422091bafb
Bart Sears [Fri, 27 May 2016 04:12:51 +0000 (04:12 +0000)]
Revert "Remove ActivityManager calls with PM.mInstallLock held"
This reverts commit
ac06a4907bff7d5ee0612dbb85180222e1455791.
Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
sreevanis [Fri, 27 May 2016 04:00:02 +0000 (04:00 +0000)]
Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am:
4ca0c8052c am:
fe33c063a9
am:
4b058ae5b7
* commit '
4b058ae5b7519664efab552f9ce91a5fcf254a36':
Added android:tools specification on navigation and actions page.
Change-Id: I36eddfe3419d165ef536e0ada8b684ce4a4e3ba4
Winson [Fri, 27 May 2016 03:59:59 +0000 (03:59 +0000)]
Merge "Prevent setting the launch task id when docking." into nyc-dev
am:
386a947616
* commit '
386a9476160ecd8d7d647d1a305126ec0917e0ab':
Prevent setting the launch task id when docking.
Change-Id: Ifbf11755b04dc3e0be9c9a2c170d5aa178b3c4df
Wale Ogunwale [Fri, 27 May 2016 03:59:53 +0000 (03:59 +0000)]
Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev
am:
20237bc68f
* commit '
20237bc68fa32422fe256f75e331a4a3bdc3fd24':
Only make Recents activity invisible if not focused on TV devices.
Change-Id: I98ed5ae3e4fd84033dca361d148d344fb28bc05a
Sreevani Sreejith [Fri, 27 May 2016 03:47:33 +0000 (03:47 +0000)]
Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am:
4ca0c8052c
am:
fe33c063a9
* commit '
fe33c063a9542722e067331907ba42b12dc130c3':
Added android:tools specification on navigation and actions page.
Change-Id: Iaef5dee8c0af55ec1698c831f3f1ff93739d4def
sreevanis [Fri, 27 May 2016 03:43:12 +0000 (03:43 +0000)]
Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs
am:
4ca0c8052c
* commit '
4ca0c8052c950f9f8a654ed5c0a112765295f1fd':
Added android:tools specification on navigation and actions page.
Change-Id: Ied53973a54a95d2590ed394ebcba0789017687da
Sreevani Sreejith [Fri, 27 May 2016 03:38:18 +0000 (03:38 +0000)]
Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs
Adam Lesinski [Fri, 27 May 2016 03:34:58 +0000 (03:34 +0000)]
Merge "Fix issue where max idle time > total idle time" into nyc-dev
am:
89046edb4d
* commit '
89046edb4d64fe1c7662103cce3a82b69e05cfe4':
Fix issue where max idle time > total idle time
Change-Id: I22908fb8f1c8ee7325687cebf646c3a03f6e1ea7
Adrian Roos [Fri, 27 May 2016 03:34:53 +0000 (03:34 +0000)]
Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev
am:
7fe83ab54e
* commit '
7fe83ab54ebe52f9226ea3dbd5cfe9050996f7a3':
Fix spurious crashes in StatusBarIconView
Change-Id: I46404e3903f17a5e2602502b5ac6554a255e30a8
Roozbeh Pournader [Fri, 27 May 2016 03:34:47 +0000 (03:34 +0000)]
Merge "Ellipsize Preference summaries" into nyc-dev
am:
0ca3829d4c
* commit '
0ca3829d4c36c96099cd1d008036c252daf90b8e':
Ellipsize Preference summaries
Change-Id: I2a787ec44b833cf03a9069b99bc79da957c562b2
Wale Ogunwale [Fri, 27 May 2016 03:34:42 +0000 (03:34 +0000)]
Merge "Protect against NPE while to updating service connection activities." into nyc-dev
am:
cef12198a7
* commit '
cef12198a729209fc8bfb2b2483fb3730f0fd428':
Protect against NPE while to updating service connection activities.
Change-Id: Ibeac7bcf9d2f85ac39d9b029cd429ae538ad8a99
Robert Carr [Fri, 27 May 2016 03:34:33 +0000 (03:34 +0000)]
Merge "Ensure surfaces only resize during relayout." into nyc-dev
am:
58f1167ecf
* commit '
58f1167ecf03c4cdce7e881ccf7c0e0506c14613':
Ensure surfaces only resize during relayout.
Change-Id: Id7820d7ef5f8dfed7f67bc9ad524de3205c1f3f1
Garfield, Tan [Fri, 27 May 2016 03:31:40 +0000 (03:31 +0000)]
Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev
am:
7a91029bff
* commit '
7a91029bff3d31e56f12ae1c070ba78043e49e0a':
Fix an assertion to avoid crash on deletions in Recent root.
Change-Id: Ibae8befa4b424b3da4bd43edb74afc28c5e30f96
Robin Lee [Fri, 27 May 2016 03:31:34 +0000 (03:31 +0000)]
Merge "Move VPN restriction check into setup dialog" into nyc-dev
am:
32ceb9c801
* commit '
32ceb9c801a86f901ec8230eec301c30e1deff3b':
Move VPN restriction check into setup dialog
Change-Id: I214e3196b6aca565ff0f45bbca1f92d6d97fc4d2
Jorim Jaggi [Fri, 27 May 2016 03:31:26 +0000 (03:31 +0000)]
Merge "Handle trampoline activites in different tasks" into nyc-dev
am:
0d35765ca3
* commit '
0d35765ca343ae7b04df7a93c233e5b6860eec22':
Handle trampoline activites in different tasks
Change-Id: I0f930e67f9cf179d7b819df9969979b12be0b929
Michael Wright [Fri, 27 May 2016 03:31:15 +0000 (03:31 +0000)]
Merge "Finalize resource IDs for N." into nyc-dev
am:
7bbab7e440
* commit '
7bbab7e440c4968a5710d31f86168a4c8de66af9':
Finalize resource IDs for N.
Change-Id: Ied7ef4d95a5ef5ad8100db724a6bc71f916f9f22
Bert McMeen [Fri, 27 May 2016 03:31:03 +0000 (03:31 +0000)]
Merge "Merge "docs: Refinements for testing" into mnc-io-docs am:
9da0730d66 am:
feb0b87230" into nyc-dev
am:
3dba0fbd53
* commit '
3dba0fbd5388c367d00543331bc2125dd2871786':
docs: Refinements for testing
Change-Id: I8f5bb3e78336a89074c2214dfa5fa270d37cc751
TreeHugger Robot [Fri, 27 May 2016 03:30:46 +0000 (03:30 +0000)]
Merge "Prevent setting the launch task id when docking." into nyc-dev
sreevanis [Fri, 27 May 2016 03:28:20 +0000 (03:28 +0000)]
Merge "Updated link to material design page. am:
ff05383baf am:
ee44b14cd4" into nyc-dev
am:
3106e71ddc
* commit '
3106e71ddc6ace7bc15b50e4a91ed98ed428bee2':
Updated link to material design page.
Change-Id: Ifc6c2b1460ed0006cc83a531f41342e4a67419ef
John Reck [Fri, 27 May 2016 03:28:09 +0000 (03:28 +0000)]
Merge "Change overdraw test to use windowbackground" into nyc-dev
am:
34979a3af6
* commit '
34979a3af6dbb6e3e33a83e5cb939ea3c8c000c7':
Change overdraw test to use windowbackground
Change-Id: I33e81c72d55fb03cf40dfe173b4b14ffab09f880
Kevin Hufnagle [Fri, 27 May 2016 03:27:58 +0000 (03:27 +0000)]
Merge "resolve merge conflicts of
7f7eec3 to nyc-dev" into nyc-dev
am:
8d063a396f
* commit '
8d063a396fbce3fae74c423a181a36272ee91231':
Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
Change-Id: I5459f1583202ccf9567e67382a1098f3a92fc0fd
Selim Cinek [Fri, 27 May 2016 03:27:43 +0000 (03:27 +0000)]
Merge "Fixed the relative time spoken with accessibility" into nyc-dev
am:
38b5946fae
* commit '
38b5946fae50d4e9e8f32c985983d03a4437910d':
Fixed the relative time spoken with accessibility
Change-Id: I51bbe71d2b86cfb8f050882b072092a015573fdb
Christopher Tate [Fri, 27 May 2016 03:27:29 +0000 (03:27 +0000)]
Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev
am:
210f2ff198
* commit '
210f2ff19808ce6b261a84596bf141909ecb381c':
Use backstop timeouts on asynchronous countdown during preflight
Change-Id: Id282e332a226ca4c9c2f38aef4c1f24e3003321b
Jorim Jaggi [Fri, 27 May 2016 03:24:20 +0000 (03:24 +0000)]
Fix toast with accessibility and app pinning
am:
cf984c56ad
* commit '
cf984c56adf88ab9d85b9a6ca71d800c2a937e6c':
Fix toast with accessibility and app pinning
Change-Id: I0c1ed9d86d6f372227a12b8f5de7f4ab0b9fd37a
George Mount [Fri, 27 May 2016 03:24:06 +0000 (03:24 +0000)]
Merge "Fix Activity Transition mess-up." into nyc-dev
am:
bd34103c5d
* commit '
bd34103c5defbfd180be6a387eb5aa82d4b97eac':
Fix Activity Transition mess-up.
Change-Id: I62457d504583e1865ceeace2918d81b4ef223b12
Wyatt Riley [Fri, 27 May 2016 03:23:44 +0000 (03:23 +0000)]
Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev
am:
793ac34219
* commit '
793ac342196c57f6b89ad9d1425fc420fbb44bb5':
Prevent use of a null sCallbackObj by Hardware FLP
Change-Id: I3681a3433f21112659840fb4431f0f616305ee3c
Alan Viverette [Fri, 27 May 2016 03:22:53 +0000 (03:22 +0000)]
Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev
am:
0f1ae5fa0f
* commit '
0f1ae5fa0f405bc3ec040fe512f7fad86577ce9f':
Prevent callbacks during DrawableContainer child initialization
Change-Id: Ica1a228184231c5d33564968605e0a0e21a1dd0b
Winson [Fri, 27 May 2016 03:22:01 +0000 (03:22 +0000)]
Merge "Fixing crash in SysUI due to invalid group." into nyc-dev
am:
814358a24f
* commit '
814358a24f7bf045cdd8261f15aefff59936287b':
Fixing crash in SysUI due to invalid group.
Change-Id: Ib194b1041b5931483857ee57c0573277e942ec31
Android Build Merger (Role) [Fri, 27 May 2016 03:14:18 +0000 (03:14 +0000)]
Merge "Merge "Time to #NameAndroidN!" into nyc-dev am:
45caebe035" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:14:09 +0000 (03:14 +0000)]
Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am:
d6ee899397" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:14:02 +0000 (03:14 +0000)]
Merge "Merge "Careful process validation for unaware providers." into nyc-dev am:
678dba737b" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:13:54 +0000 (03:13 +0000)]
Merge "Defer calling the stack task removed callbacks. am:
6c8217ab30" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 27 May 2016 03:13:44 +0000 (03:13 +0000)]
Merge changes from topic 'am-
e4ceb878ab564c70a4e1726ee7c0709a' into nyc-mr1-dev
* changes:
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am:
a39d888651
Merge "Replace caribou wallpaper without the stars b/
28339724" into nyc-dev am:
b3d4ad2205
Android Build Merger (Role) [Fri, 27 May 2016 03:13:31 +0000 (03:13 +0000)]
Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556 am:
28bdf2907a" into nyc-mr1-dev
Dan Sandler [Fri, 27 May 2016 03:12:50 +0000 (03:12 +0000)]
Merge "Time to #NameAndroidN!" into nyc-dev
am:
45caebe035
* commit '
45caebe035a67db18d06c4f4e4f124246fb5321d':
Time to #NameAndroidN!
Change-Id: Iecedefbae64d4a6ffb67971be0f9da5eb746b1ed
Jeff Sharkey [Fri, 27 May 2016 03:12:31 +0000 (03:12 +0000)]
Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev
am:
d6ee899397
* commit '
d6ee8993973050befff3a5f10f273ef9e8a050e2':
Delay PACKAGE_RESTARTED until after data cleared.
Change-Id: I8bb3f31a6de42da81a44c9aaf121769ed96b6a3b
Jeff Sharkey [Fri, 27 May 2016 03:12:15 +0000 (03:12 +0000)]
Merge "Careful process validation for unaware providers." into nyc-dev
am:
678dba737b
* commit '
678dba737bed94eb5eeeed63db74aa811ee896cb':
Careful process validation for unaware providers.
Change-Id: I7856be9d44587869ee73533072aaf26d8a7908ab
Winson [Fri, 27 May 2016 03:11:47 +0000 (03:11 +0000)]
Defer calling the stack task removed callbacks.
am:
6c8217ab30
* commit '
6c8217ab3072fa65851316a922b482506b3c2a4c':
Defer calling the stack task removed callbacks.
Change-Id: Icf53cc0628c98293b3a2d4ab28d95e54ee93f248
Jeff Sharkey [Fri, 27 May 2016 03:11:06 +0000 (03:11 +0000)]
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev
am:
a39d888651
* commit '
a39d888651493d20f3814cd88a39a521450b3eac':
Suppress unlock notifications on non-FBE devices.
Change-Id: I9e17a23b0f3127ac5ae0f08cbf0a6c306aaba9d5
Hyunyoung Song [Fri, 27 May 2016 03:08:58 +0000 (03:08 +0000)]
Merge "Replace caribou wallpaper without the stars b/
28339724" into nyc-dev
am:
b3d4ad2205
* commit '
b3d4ad220598beffb30ac4cd44741ff19da2c57a':
Replace caribou wallpaper without the stars b/
28339724
Change-Id: I8062526bf7ba313e924621cf6a16ceb738e72d72
TreeHugger Robot [Fri, 27 May 2016 03:08:37 +0000 (03:08 +0000)]
Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev
Eric Schmidt [Fri, 27 May 2016 03:08:38 +0000 (03:08 +0000)]
Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am:
8e08dbe8f8 am:
400aed3556
am:
28bdf2907a
* commit '
28bdf2907aa5448f455475fde399870c22c4180a':
docs: Removing CLI steps in getting started docs
Change-Id: Iaf0135b79c79cb299055096091bc1519527ab1b7
Julia Reynolds [Fri, 27 May 2016 03:06:10 +0000 (03:06 +0000)]
Merge "Unlocked access of mServices is bad." into nyc-dev
am:
d9599faf6b
* commit '
d9599faf6b872fb5e1db72f7239b21d05050bd47':
Unlocked access of mServices is bad.
Change-Id: I84a2e07aa57e5e25ac1190b4dbfa4005c6d1e572
Julia Reynolds [Fri, 27 May 2016 03:05:42 +0000 (03:05 +0000)]
Merge "Reset slider animator on density change" into nyc-dev
am:
d52a81eeae
* commit '
d52a81eeae2b9b8425a75ee8906ed7b94b5c471a':
Reset slider animator on density change
Change-Id: I75012bd5af8ae07e5917fbffbc18cf1120e09ebc
Fyodor Kupolov [Fri, 27 May 2016 03:05:20 +0000 (03:05 +0000)]
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
am:
a4dbdaf5e9
* commit '
a4dbdaf5e96273dccd474e31700d84a1ad907503':
Remove ActivityManager calls with PM.mInstallLock held
Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
smain@google.com [Fri, 27 May 2016 03:05:00 +0000 (03:05 +0000)]
add redirect for Espresso Test Recorder doc that will soon be on TAC site. am:
8f60544180 am:
e1bd7e15c5
am:
5d3ca78d3f
* commit '
5d3ca78d3f561e98ae67cf97caa58a4e9e2ed5cd':
add redirect for Espresso Test Recorder doc that will soon be on TAC site.
Change-Id: I339dffae3b9532699c558d406b03a32dabae6517
TreeHugger Robot [Fri, 27 May 2016 03:04:42 +0000 (03:04 +0000)]
Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev
Paul Jensen [Fri, 27 May 2016 03:04:34 +0000 (03:04 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb am:
a5a2c88fb3 am:
7ff57eaff9 am:
94c8855da6
am:
50615e498e
* commit '
50615e498e11f356ef582af0f9616945d04faa80':
Don't pass URL path and username/password to PAC scripts
Change-Id: I2197af29029456780438123c59214c3d8c58a6ef
Christopher Tate [Fri, 27 May 2016 02:58:27 +0000 (02:58 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886 am:
1fa817c057 am:
040cf14047 am:
0905c8f398 -s ours
am:
d39c0a8d77
* commit '
d39c0a8d775988bfbf319777b2a17af1579b531a':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: Icd0546a4c3d1e01b356958b78ba143e44061515e
Teng-Hui Zhu [Fri, 27 May 2016 02:50:14 +0000 (02:50 +0000)]
Merge "Update the light center when the root view\'s layout changed" into nyc-dev
am:
e78ba24c17
* commit '
e78ba24c176fd6a0c54eaf7e52be545952ba1ab7':
Update the light center when the root view's layout changed
Change-Id: Ic973b9b47df6550c5170c2248c7e0f2ab25c6a57
Phil Burk [Fri, 27 May 2016 02:49:44 +0000 (02:49 +0000)]
Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev
am:
d34d06606d
* commit '
d34d06606dd5be9fc18029e87cb4b56ecef21864':
AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY
Change-Id: I3c7741fcf914f4e2f6cf89eaec2d72ba519a24b1
Rubin Xu [Fri, 27 May 2016 02:48:59 +0000 (02:48 +0000)]
Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev
am:
1ad12e0678
* commit '
1ad12e0678e87e2ed64dcbc878ee2c7136b5ccdb':
Elaborate on requirement to support PreRebootSecurityLogs
Change-Id: I088c0a0980517d3b4ffa6fe1b1aa9add7620c6e0
Bill Yi [Fri, 27 May 2016 02:47:12 +0000 (02:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
9aed8c2fa0 -s ours
* commit '
9aed8c2fa01785be20cd7cc07976670812bc84a0':
Import translations. DO NOT MERGE
Change-Id: I0305b137eed7ecf9e4b149a0f589e658de16811f
Bill Yi [Fri, 27 May 2016 02:46:32 +0000 (02:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
cb8c569414 -s ours
* commit '
cb8c569414121158adb2a627d4a91b47dd3c4362':
Import translations. DO NOT MERGE
Change-Id: I6ed4074aea21921c930baa71f5564b7dd847618e
Julia Reynolds [Fri, 27 May 2016 02:43:28 +0000 (02:43 +0000)]
Merge "Importance slider updates." into nyc-dev
am:
2bf73e94c3
* commit '
2bf73e94c389bf9457df132d6eaf294f9d35587f':
Importance slider updates.
Change-Id: Ia9d063f6422259f80aeee6fe2d27ca1354538955
Jeff Sharkey [Fri, 27 May 2016 02:42:44 +0000 (02:42 +0000)]
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
am:
36cbf5ca37
* commit '
36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
Cache IMountService for isUserKeyUnlocked() calls.
Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
Jason Monk [Fri, 27 May 2016 02:42:04 +0000 (02:42 +0000)]
Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev
am:
72f19ff6f0
* commit '
72f19ff6f057fff184c875194e802005f8e8fd08':
QS: Make hotspot go unavailable in airplane mode
Change-Id: Ia21b21a840106fcbd7ca534ee639f43c0487a396
Robin Lee [Fri, 27 May 2016 02:39:45 +0000 (02:39 +0000)]
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev
am:
33154deb70
* commit '
33154deb700a8cf5df6fff39f0b3291d1278efa0':
Check if we're connected before marking a UID blocked
Change-Id: I7a2552f43c66b1b1adb094d3b91ef87648e57bde
Chris Wren [Fri, 27 May 2016 02:28:03 +0000 (22:28 -0400)]
resolve merge conflicts of
0f97b8f to nyc-mr1-dev
Change-Id: I5e03144e3ae95777eb651add098eabe8af6ad08e
Adam Lesinski [Fri, 27 May 2016 01:44:31 +0000 (01:44 +0000)]
Merge "Fix issue where max idle time > total idle time" into nyc-dev
Adrian Roos [Fri, 27 May 2016 01:04:14 +0000 (01:04 +0000)]
Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev
Adrian Roos [Fri, 27 May 2016 00:17:02 +0000 (17:17 -0700)]
Fix spurious crashes in StatusBarIconView
Fixes a crash that happens when we cannot look up a package's
resources for reasons.
Change-Id: I4884536a3eefa8fe82bd274925241f4c798e08e3
Fixes:
28982204
Fyodor Kupolov [Fri, 27 May 2016 00:48:37 +0000 (00:48 +0000)]
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
Roozbeh Pournader [Fri, 27 May 2016 00:11:13 +0000 (00:11 +0000)]
Merge "Ellipsize Preference summaries" into nyc-dev
TreeHugger Robot [Fri, 27 May 2016 00:08:15 +0000 (00:08 +0000)]
Merge "Protect against NPE while to updating service connection activities." into nyc-dev
Rob Carr [Thu, 26 May 2016 23:58:31 +0000 (23:58 +0000)]
Merge "Ensure surfaces only resize during relayout." into nyc-dev
Winson [Thu, 26 May 2016 23:42:15 +0000 (16:42 -0700)]
Prevent setting the launch task id when docking.
- In this case, recents is the last running task instead of the
previously fullscreen app (likely due to some preparation for the
docking), and we should not set the task to launch/cancel window
transitions for.
Bug:
28943422
Change-Id: I3c381d3fa33a69adb7d8b606633433a898841526
Garfield Tan [Thu, 26 May 2016 23:46:40 +0000 (23:46 +0000)]
Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev
Robin Lee [Thu, 26 May 2016 23:41:27 +0000 (23:41 +0000)]
Merge "Move VPN restriction check into setup dialog" into nyc-dev
Jorim Jaggi [Thu, 26 May 2016 23:38:08 +0000 (23:38 +0000)]
Merge "Handle trampoline activites in different tasks" into nyc-dev
Jorim Jaggi [Thu, 19 May 2016 17:20:28 +0000 (10:20 -0700)]
Handle trampoline activites in different tasks
When the app uses a trampoline activity that launches in a different
task than the main task, we fail to show recents when the task is
docked and the user launches the trampoline activity from home. Add
logic to handle this case.
Bug:
28368989
Change-Id: Iea29e6cd1a9919da0e856955691fac4792e30604
OSDN Git Service
