OSDN Git Service
Dirk Dougherty [Fri, 2 Sep 2016 22:31:57 +0000 (22:31 +0000)]
Merge "Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead..." into nyc-dev
am:
460b9c08e6
Change-Id: I55c8a7dc7b90a12b177f3923731a2ad913bed60b
Dirk Dougherty [Fri, 2 Sep 2016 22:31:54 +0000 (22:31 +0000)]
Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead...
am:
169f86ce7a
Change-Id: I714461981eb3ed28178006c4acf4cd111204b4bb
Dirk Dougherty [Fri, 2 Sep 2016 22:26:59 +0000 (22:26 +0000)]
Merge "Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead..." into nyc-dev
Scott Main [Fri, 2 Sep 2016 21:36:21 +0000 (21:36 +0000)]
Merge "switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev. also update all non-DAC builds to use the "referenceonly" flag for a cleaner output and faster build." into nyc-dev
am:
915b566ef0
Change-Id: Id9917788f79f73a7a7f4caa1d45508ae50c00337
smain@google.com [Fri, 2 Sep 2016 21:36:07 +0000 (21:36 +0000)]
switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev. also update all non-DAC builds to use the "referenceonly" flag for a cleaner output and faster build.
am:
534bfe1a4a
Change-Id: I9833fe119f6e5fef4cd74439c71d6a40fb5d5db9
Scott Main [Fri, 2 Sep 2016 21:27:19 +0000 (21:27 +0000)]
Merge "switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev. also update all non-DAC builds to use the "referenceonly" flag for a cleaner output and faster build." into nyc-dev
Dirk Dougherty [Fri, 2 Sep 2016 17:00:37 +0000 (17:00 +0000)]
Exclude sdk files from metadata.
am:
355f33a1d9
Change-Id: I4f99fd37bde61dfc813662e0e6d05412b3aef26c
smain@google.com [Fri, 2 Sep 2016 02:52:17 +0000 (19:52 -0700)]
switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev.
also update all non-DAC builds to use the "referenceonly" flag for a cleaner output and faster build.
Change-Id: Iebd9791305479c5dc406ba3b81eaf076855bc632
Dirk Dougherty [Thu, 1 Sep 2016 21:07:47 +0000 (14:07 -0700)]
Exclude sdk files from metadata.
Change-Id: I16f89a3bfae32a0fa54037e328fc784133e5d9b0
Bug-Id:
31244539
Wyatt Riley [Thu, 1 Sep 2016 20:24:06 +0000 (13:24 -0700)]
Canada AGNSS settings update
Esp. LPP. See also some overlay changes.
Change-Id: I0a694cf25df12c51e7d01ec4d8f2ab419786de00
Andrew Solovay [Thu, 1 Sep 2016 04:57:12 +0000 (04:57 +0000)]
docs: Typo fix in multi-window docs
am:
0b423e5eae
Change-Id: I18fe652d972196630006517bacc26b7441efe9ed
Andrew Solovay [Mon, 29 Aug 2016 18:48:50 +0000 (11:48 -0700)]
docs: Typo fix in multi-window docs
Referred to the "android:resizableActivity" property; should
have been "android:resizeableactivity". English prose, however,
consistently uses the (preferred) spelling "resizable".
See first comment for stage location.
bug:
30566808
Change-Id: I2570ff9269b4d2dc8b11f1c98817e50726be78fc
Andrew Solovay [Thu, 1 Sep 2016 02:26:28 +0000 (02:26 +0000)]
Merge "docs: Fixing formatting problem" into nyc-dev
am:
9499478c80
Change-Id: I893084adf8c6609b451da79ae69c5460619c6f7b
Andrew Solovay [Thu, 1 Sep 2016 02:26:24 +0000 (02:26 +0000)]
docs: Fixing formatting problem
am:
6f29c2091c
Change-Id: I07d721faba05a3eb8b846bea260ee22da08d28e0
Andrew Solovay [Thu, 1 Sep 2016 02:21:46 +0000 (02:21 +0000)]
Merge "docs: Fixing formatting problem" into nyc-dev
Cheryl Potter [Thu, 1 Sep 2016 02:13:34 +0000 (02:13 +0000)]
docs: fixing gpu debugger redirect b/
31227713
am:
780395fd85
Change-Id: Ia285191b97afd5448ed44783d9fbf01c01927744
Cheryl Potter [Thu, 1 Sep 2016 00:43:37 +0000 (17:43 -0700)]
docs: fixing gpu debugger redirect
b/
31227713
Change-Id: Ia0e7e4d26940dc98ab735df3068dc2dda22b1f58
Cheryl Potter [Thu, 1 Sep 2016 00:30:55 +0000 (00:30 +0000)]
docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) b/
31158856 b/
31157097 b/
31158502
am:
3f2d7d8e22
Change-Id: I06fc6611cf1a802e4971385d6b105a223b6c9301
Cheryl Potter [Wed, 31 Aug 2016 21:31:50 +0000 (14:31 -0700)]
docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more)
b/
31158856
b/
31157097
b/
31158502
Change-Id: Id3178127e0267936c58f47cd7da7348202051fa3
TreeHugger Robot [Wed, 31 Aug 2016 20:31:53 +0000 (20:31 +0000)]
Merge "Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped" into nyc-dr1-dev
Wyatt Riley [Wed, 31 Aug 2016 19:56:54 +0000 (19:56 +0000)]
Merge "AGNSS LPP settings for Telus & Bell" into nyc-dr1-dev
Adrian Roos [Wed, 31 Aug 2016 17:25:38 +0000 (10:25 -0700)]
Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped
Fixes a bug where the wrong part of an image was decoded if
the image needed to be scaled but not cropped.
Change-Id: I011e59d85b526097ef1daabd63805c7cdc74c17b
Fixes:
31112957
Wyatt Riley [Wed, 31 Aug 2016 18:52:40 +0000 (18:52 +0000)]
Merge "Custom LPP AGPS config for Rogers" into nyc-dr1-dev
Wyatt Riley [Wed, 31 Aug 2016 17:59:59 +0000 (10:59 -0700)]
AGNSS LPP settings for Telus & Bell
Similar to Rogers settings
Mcc/Mnc values selected from mcclist.com, intersected with
existing config.xml files
Bug:
31187109
Bug:
31186773
Change-Id: Iba3ebc873828b6f59765674817bc86f6337e618c
Svetoslav Ganov [Wed, 31 Aug 2016 17:29:16 +0000 (17:29 +0000)]
Merge "Properly close fd backing a MemoryIntArray" into nyc-dev
am:
84763eb770
Change-Id: I8731aba97e11c4f0143aafd77764dcbaeeb1b1d2
Svetoslav Ganov [Wed, 31 Aug 2016 17:29:13 +0000 (17:29 +0000)]
Properly close fd backing a MemoryIntArray
am:
e257d6e167
Change-Id: I8b8dd8470eba5ad71b7356f1ad44ef49a2c61bff
Svetoslav Ganov [Wed, 31 Aug 2016 17:25:28 +0000 (17:25 +0000)]
Merge "Properly close fd backing a MemoryIntArray" into nyc-dev
Svetoslav Ganov [Mon, 29 Aug 2016 18:14:05 +0000 (11:14 -0700)]
Properly close fd backing a MemoryIntArray
Use ParcelFileDescriptor only as an IPC transport
to make sure MemoryIntArray manges its backing fd.
Bug:
30310689
Change-Id: Ib3cc13ef4ae2a744e5f7a96099570e0431847bce
(cherry picked from commit
fe2462f3a60b34ee6b7d8764d92ae58fc0cd7dfd)
Scott Main [Wed, 31 Aug 2016 03:40:39 +0000 (03:40 +0000)]
Merge "replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)" into nyc-dev
am:
a06f40bd05
Change-Id: I7397fe1ec81cc6ed594df221b88ee77cbdd4f2e4
smain@google.com [Wed, 31 Aug 2016 03:40:37 +0000 (03:40 +0000)]
replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)
am:
dde8deb950
Change-Id: Ide293756b6b7a75a434ff9ed3cf15cd40fbd3452
Scott Main [Wed, 31 Aug 2016 03:06:08 +0000 (03:06 +0000)]
Merge "replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)" into nyc-dev
Mike Tsao [Wed, 31 Aug 2016 01:30:01 +0000 (01:30 +0000)]
Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev
Wyatt Riley [Tue, 30 Aug 2016 23:25:30 +0000 (16:25 -0700)]
Custom LPP AGPS config for Rogers
Adding a GPS section to two .xml files
for Rogers (Canada), with LPP_PROFILE=2
Bug:
31166909
Change-Id: I0bc39e12f08c4bcd7aa6c5e1a9c3d81924651f10
Adam Seaton [Tue, 30 Aug 2016 23:28:44 +0000 (23:28 +0000)]
Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit
8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am:
b57e6560d0
am:
e245037327
Change-Id: I477f3e1c5e685df2ef2a335790ab49aac6c13eef
Adam Seaton [Tue, 30 Aug 2016 23:15:49 +0000 (23:15 +0000)]
Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit
8abcfed8a42a1ca517ee3c8d0448fda669ff9ded.
am:
b57e6560d0
Change-Id: Idaafcb7c835aa7b7b83bb7382900ef3d18fa551f
Jason Monk [Tue, 30 Aug 2016 23:03:16 +0000 (23:03 +0000)]
Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev
am:
a845535045
Change-Id: I138faa4899fac332af6f2297c898beb187fa7483
Jason Monk [Tue, 30 Aug 2016 23:03:11 +0000 (23:03 +0000)]
Backup system QS tiles DO NOT MERGE
am:
37bd2be160 -s ours
Change-Id: Iec5455c466d2c92103666f24d1eee750061bebca
TreeHugger Robot [Tue, 30 Aug 2016 22:30:15 +0000 (22:30 +0000)]
Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev
Adam Seaton [Tue, 30 Aug 2016 22:14:47 +0000 (22:14 +0000)]
Revert "Bump up the uncrypt timeout to 30 min."
Creates Null Build to test OTA failure fix.
This reverts commit
8abcfed8a42a1ca517ee3c8d0448fda669ff9ded.
Change-Id: I64474dad467ce8d8e379e0e2c47814d76ac0ee0d
smain@google.com [Tue, 30 Aug 2016 01:36:50 +0000 (18:36 -0700)]
replace the N Preview landing page with the redirect to the package index
also update version metadata (no longer preview, now 7.0)
Change-Id: I84af003daa9bae3bc932c8b87921ed82f813e1cf
Jason Monk [Tue, 30 Aug 2016 20:33:48 +0000 (16:33 -0400)]
Fix QS CTS failure caused by tile backup
The CTS tests weren't receiving the onTileAdded callbacks since the
shade was not in the listening state when tiles were added. This is
not possible for users (since tiles are added while the UI is
listening), but add a flushMessagesAndUnbind call to make sure the
tiles always receive onTileAdded.
Since now flushMessagesAndUnbind can be called before a real call
to setBindService(true), add a clause that will clear out its
immediate unbind state.
Change-Id: Idd13c432a4af5741813da9a9b1b292a47fd9443b
Fixes:
31147742
Pankaj Kanwar [Tue, 30 Aug 2016 20:11:06 +0000 (20:11 +0000)]
Merge changes Iccb6d089,I9c50a59f into nyc-dr1-dev
* changes:
Network switch notifications: rate & daily limits
Network Switching Notifications: add unit tests
Makoto Onuki [Tue, 30 Aug 2016 19:54:55 +0000 (19:54 +0000)]
Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev
Jason Monk [Thu, 25 Aug 2016 19:57:14 +0000 (15:57 -0400)]
Backup system QS tiles DO NOT MERGE
Add QS tiles to the backup list. Non-system tiles will get removed
since they won't be installed when restore happens.
Change-Id: Iccf6e773384c45bd4d1f10c21aa8af356b3920d2
Bug:
28782938
Mark Goldstein [Tue, 30 Aug 2016 18:39:27 +0000 (18:39 +0000)]
Merge "docs: Fix broken camera example" into nyc-dev
am:
36f4638fe7
Change-Id: Id8a885af6c0f9887e6aaa82f662c264c86ba9791
Mark Goldstein [Tue, 30 Aug 2016 18:39:24 +0000 (18:39 +0000)]
docs: Fix broken camera example
am:
3f97bc25d4
Change-Id: I80f79eab0f11185f671bad1b57766f6fcf874464
Mark Goldstein [Tue, 30 Aug 2016 18:34:21 +0000 (18:34 +0000)]
Merge "docs: Fix broken camera example" into nyc-dev
Scott Main [Tue, 30 Aug 2016 18:14:17 +0000 (18:14 +0000)]
Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug:
31098748" into nyc-dev
am:
4d1f3047e3
Change-Id: Ia0ba032f2035d2fcd326c658e348cf2d0fbdeed9
smain@google.com [Tue, 30 Aug 2016 18:14:12 +0000 (18:14 +0000)]
add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug:
31098748
am:
99e44c903c
Change-Id: I6f407f90b8e53849a6d1c0ed70adb1ca8c90234f
Scott Main [Tue, 30 Aug 2016 18:09:03 +0000 (18:09 +0000)]
Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug:
31098748" into nyc-dev
Raph Levien [Tue, 30 Aug 2016 17:33:35 +0000 (17:33 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
am:
5d628b1e45
Change-Id: I4a2b24becdda847b7cf301d7224c218a1fab7dc7
Raph Levien [Tue, 30 Aug 2016 17:33:33 +0000 (17:33 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal
am:
9cde7244b6
Change-Id: I461863c5a4dad8f050b14f55d14020ab1a0874f7
Raph Levien [Tue, 30 Aug 2016 17:25:55 +0000 (17:25 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
Lorenzo Colitti [Mon, 29 Aug 2016 05:03:11 +0000 (14:03 +0900)]
Network switch notifications: rate & daily limits
This patch adds a daily limit to the maximum number of notifications
shown when switching networks.
It also adds a rate limit to prevent rapid successive notifications in
flapping scenarios.
Bug:
31132499
Change-Id: Iccb6d0899646ea6df3cfad32a421922263e0eb85
Hugo Benichi [Tue, 30 Aug 2016 01:01:15 +0000 (10:01 +0900)]
Network Switching Notifications: add unit tests
BUG:
31132499
Change-Id: I9c50a59fe48efdcb51d2517f0a756691700c3ebe
TreeHugger Robot [Tue, 30 Aug 2016 10:46:30 +0000 (10:46 +0000)]
Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev
Paul Jensen [Tue, 30 Aug 2016 05:44:34 +0000 (05:44 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
am:
b9d4f91630
Change-Id: Ibea7e0328b1f7c74bf2edcc054cad2a54def905b
Paul Jensen [Tue, 30 Aug 2016 05:42:04 +0000 (05:42 +0000)]
Sanity check ICMP6 router advertisement packets
am:
a36213867a -s ours
Change-Id: I8371809758391158effb378fae4b6fc9aaca553c
TreeHugger Robot [Tue, 30 Aug 2016 05:20:10 +0000 (05:20 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
Paul Jensen [Wed, 20 Jul 2016 19:01:17 +0000 (15:01 -0400)]
Sanity check ICMP6 router advertisement packets
There is a chance a packet can slip by before we install the filter
on our socket listening for RAs, so add some basic sanity checking
to make sure we've recieved an RA.
Change-Id: I14cf84a0814896a41e00f50af376dfc4988d36cb
Fixes:
29586253
Todd Kennedy [Tue, 30 Aug 2016 01:48:47 +0000 (01:48 +0000)]
Merge "update shared libraries for system apps" into nyc-dev
am:
689c92db9d
Change-Id: Iea85964ca4ee5557599858572864b51ea7dd53f3
Todd Kennedy [Tue, 30 Aug 2016 01:48:45 +0000 (01:48 +0000)]
update shared libraries for system apps
am:
85a91def5c
Change-Id: Iea6f0e3809bc5e4c77a1d5d83be67d6c285bea65
TreeHugger Robot [Tue, 30 Aug 2016 01:44:29 +0000 (01:44 +0000)]
Merge "update shared libraries for system apps" into nyc-dev
John Reck [Mon, 29 Aug 2016 23:41:44 +0000 (23:41 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev
am:
8eaa65b867
Change-Id: Iaf8ab16f6a1421ff6a19bf81a54b82111f6747f4
Chris Craik [Mon, 29 Aug 2016 23:41:42 +0000 (23:41 +0000)]
Cherry pick TextureView fixes
am:
2e8a8a2432
Change-Id: I1ae3cdc7181e9bef40e38204ede002de973dee98
John Reck [Mon, 29 Aug 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev
Mark Goldstein [Fri, 26 Aug 2016 18:29:25 +0000 (11:29 -0700)]
docs: Fix broken camera example
Removed bad out of date instructions and link to better
training pages instead.
Bug:
15562334
Change-Id: I77fe558e665de509eb11a2c668ba7bdcdbab3c6f
Todd Kennedy [Thu, 28 Jul 2016 20:28:16 +0000 (13:28 -0700)]
update shared libraries for system apps
After removing updates for a system package, we weren't updating its
shared libraries when we should have. Make it so.
NOTE: This didn't affect device boot because we update all of the
shared libraries for all system applications after scanning packages.
Bug:
30266503
Change-Id: I8edf4344228fb3e793e7648ea70a041cb5db6af6
(cherry picked from commit
6058df65e645a81bdc7285dcd9f8b12b9f5b534f)
Yohei Yukawa [Mon, 29 Aug 2016 22:49:24 +0000 (22:49 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev
am:
b7efddfc41
Change-Id: I6a5c98b87dffb4cd3db5e434743b463142a50e1d
Yohei Yukawa [Mon, 29 Aug 2016 22:45:50 +0000 (22:45 +0000)]
Make sure IME focus is synced to View focus
am:
8eb07090a4 -s ours
Change-Id: I32b177a7ea77566ed7b2f1808398b70c64bb756d
TreeHugger Robot [Mon, 29 Aug 2016 22:35:21 +0000 (22:35 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:31:37 +0000 (22:31 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
am:
59fb472858
Change-Id: I68cef7811c79e264c685fcaae30b501d29789af5
Yuichi Biwa [Mon, 29 Aug 2016 22:31:33 +0000 (22:31 +0000)]
ChooserActivity: Cannot start app that the icon overflows the layout
am:
cb3e1237b5
Change-Id: I93bb2ff3a13f31f6ce6d2ab7161eba3f1be17999
Chet Haase [Mon, 29 Aug 2016 22:31:28 +0000 (22:31 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
am:
22e006214c
Change-Id: Ib19c9f7c09574796d8446f2195323d78aa6b8811
Alan Viverette [Mon, 29 Aug 2016 22:31:24 +0000 (22:31 +0000)]
Set up view state before attaching, jump drawables if needed
am:
c328f042a6 -s ours
Change-Id: If8eeea4957a19389c9fea47bd0b31dbcc5d51b21
Chet Haase [Mon, 29 Aug 2016 22:31:20 +0000 (22:31 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
am:
a1bbb76806
Change-Id: I1f1d1efab0844204df403fdc7619b6c6d8b1fb77
Adam Powell [Mon, 29 Aug 2016 22:31:16 +0000 (22:31 +0000)]
Force AlertDialogLayout to have gravity start|top
am:
00c4f7ba65
Change-Id: If329f03f0475cb0b65ed62d97ee97285f8d24038
Chet Haase [Mon, 29 Aug 2016 22:31:09 +0000 (22:31 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
am:
c80a4d7ae3
Change-Id: I39589f091b9f34581f20323e721a3d1ab2887c32
Abodunrinwa Toki [Mon, 29 Aug 2016 22:31:04 +0000 (22:31 +0000)]
FloatingActionMode: Fix screen coordinates.
am:
99c340cad9
Change-Id: If69592a88c5296d1321a08d78231492efaac6645
Chet Haase [Mon, 29 Aug 2016 22:13:09 +0000 (22:13 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:12:07 +0000 (22:12 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:25 +0000 (22:11 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:07 +0000 (22:11 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
Christopher Tate [Mon, 29 Aug 2016 21:55:38 +0000 (21:55 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
am:
2bbfe98062
Change-Id: I05c5b636f7edec76ab85c4e9b9d248c41acb4157
Christopher Tate [Mon, 29 Aug 2016 21:55:30 +0000 (21:55 +0000)]
Eliminate next-alarm-clock broadcast flapping
am:
c60da1edc1
Change-Id: Id45dadd7ccebf91435e197f86f5fba71127c0986
TreeHugger Robot [Mon, 29 Aug 2016 21:47:02 +0000 (21:47 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
Pankaj Kanwar [Mon, 29 Aug 2016 21:37:39 +0000 (21:37 +0000)]
Merge "Update InCallService#onConnectionEvent comments." into nyc-dr1-dev
Chris Craik [Mon, 25 Jul 2016 22:29:59 +0000 (15:29 -0700)]
Cherry pick TextureView fixes
The following changes are in this commit:
Avoid destroying TextureView surfaces for onStop
bug:
30238922
TextureViews will hold onto their backing surfaces, which will allow
them to resume gracefully when the app's surfaces are saved.
Now only resources that are destroyed for onStop are DisplayLists.
(cherry picked from commit
391d560402c2902e0fd701f99eabd91025154201)
TextureView: destroy layer on destroyHardwareResources event
bug:
30468770
(cherry picked from commit
1c16c37d8646ed25e844af8472eede988ad0c2f0)
Fix NPE in TextureView
Bug:
30651595
(cherry picked from commit
3c2587f26eed32a8723488131d1d8940dc147ee1)
Fix NPE in TextureView
Bug:
30779663
(cherry picked from commit
7e237189c292cdb886733eb95c6069b7ac002527)
Fix maps resume being blank
Bug:
30889568
Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.
(cherry picked from commit
03df0834e63b587dbfb8fdcd0086e3e1e72b9f9d)
Andrii Kulian [Mon, 29 Aug 2016 21:17:02 +0000 (21:17 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
am:
c8417676ed
Change-Id: I74e1b45ce3eaf9edec6fb60394da3ad8a818d214
Andrii Kulian [Mon, 29 Aug 2016 21:16:59 +0000 (21:16 +0000)]
DO NOT MERGE -- Fix finishing activity in non-focused stack
am:
772c598f66
Change-Id: I890f3b460787682bbe0fdb4d8ce44364f1839dac
TreeHugger Robot [Mon, 29 Aug 2016 21:10:31 +0000 (21:10 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
Christopher Tate [Wed, 3 Aug 2016 21:57:47 +0000 (14:57 -0700)]
Eliminate next-alarm-clock broadcast flapping
When multiple alarm clocks are scheduled at the same time, we would
flap among the alternatives for considering them the 'next upcoming
alarm clock', which in turn would generate [many] spurious broadcasts
about changes to the upcoming alarm situation. This is now fixed;
once we have found the soonest upcoming alarm clock, we stick with
that one until it becomes unavailable, eliminating the spurious
broadcast traffic.
Bug
29501073
Change-Id: Ice1892490bb339e05fa8bd9d324fa1c6718b4942
(cherry picked from commit
76389c00d3d3ce79e48d9e87b597707ed3e8970c)
Tao Bao [Mon, 29 Aug 2016 19:34:23 +0000 (19:34 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4
am:
c5a17fc39f
Change-Id: Ib637e1f00ddebbac5a3bea6ff31f08854a95b7ea
Tao Bao [Mon, 29 Aug 2016 19:26:43 +0000 (19:26 +0000)]
Bump up the uncrypt timeout to 30 min.
am:
8abcfed8a4
Change-Id: I35340614fe09f96f8c31cc53a99e366580294490
Andrii Kulian [Mon, 29 Aug 2016 18:51:55 +0000 (18:51 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am:
128a4419e9
Change-Id: I6c28db82c53af5a68c3d875ecca920b9a1364b32
Andrii Kulian [Mon, 29 Aug 2016 18:44:11 +0000 (18:44 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack
am:
620040db3f -s ours
Change-Id: I62703cc7f62bf42967021ce8defa30669e096ec2
Andrii Kulian [Fri, 29 Jul 2016 19:55:41 +0000 (12:55 -0700)]
DO NOT MERGE -- Fix finishing activity in non-focused stack
This CL explicitly checks if we're finishing activity in non-focused
stack as there are other cases except this one when we finish paused
activities in FINISH_AFTER_VISIBLE mode.
Bug:
29007436
Bug:
29458854
Change-Id: I67744d23cd72f2fe8861180008bfdd284a7b5e26
(cherry picked from commit
995fa2bd2d334a37e10760c21ac108f4a3595713)
Andrii Kulian [Mon, 29 Aug 2016 18:30:06 +0000 (18:30 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
Jason Monk [Mon, 29 Aug 2016 18:26:00 +0000 (18:26 +0000)]
Merge "Fix double status bar icons" into nyc-dev
am:
2b4e612b10
Change-Id: Ib0d9e51d289215d96525b68d0432b959e9b58f2f
Jason Monk [Mon, 29 Aug 2016 18:25:57 +0000 (18:25 +0000)]
Fix double status bar icons
am:
12124d7eca
Change-Id: Ief00496f19d2e249129023a03cd9f53d76fa7bf8