Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,927 Commits 3 Branches 0 Tags
254890a98c63c0ce4a3d39b9bb415bdff46f64cd
Commit Graph

250927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
254890a98c 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
 2016-08-30 18:14:17 +00:00
smain@google.com
939c23d05a 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
 2016-08-30 18:14:12 +00:00
Scott Main
4d1f3047e3 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 2016-08-30 18:09:06 +00:00
Raph Levien
3a25ff9402 Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev 
am: 5d628b1e45

Change-Id: I4a2b24becdda847b7cf301d7224c218a1fab7dc7
 2016-08-30 17:33:35 +00:00
Raph Levien
75152d61b0 Enforce consistent sizes for arrays in SpannableStringInternal 
am: 9cde7244b6

Change-Id: I461863c5a4dad8f050b14f55d14020ab1a0874f7
 2016-08-30 17:33:33 +00:00
Raph Levien
5d628b1e45 Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev 2016-08-30 17:25:58 +00:00
TreeHugger Robot
f45f9d31d3 Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev 2016-08-30 10:46:33 +00:00
Paul Jensen
79ecffe719 Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev 
am: b9d4f91630

Change-Id: Ibea7e0328b1f7c74bf2edcc054cad2a54def905b
 2016-08-30 05:44:34 +00:00
Paul Jensen
e39980689e Sanity check ICMP6 router advertisement packets 
am: a36213867a  -s ours

Change-Id: I8371809758391158effb378fae4b6fc9aaca553c
 2016-08-30 05:42:04 +00:00
TreeHugger Robot
b9d4f91630 Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev 2016-08-30 05:20:12 +00:00
Paul Jensen
a36213867a 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
 2016-08-30 10:57:30 +09:00
Todd Kennedy
69b47a2010 Merge "update shared libraries for system apps" into nyc-dev 
am: 689c92db9d

Change-Id: Iea85964ca4ee5557599858572864b51ea7dd53f3
 2016-08-30 01:48:47 +00:00
Todd Kennedy
7c23d3f837 update shared libraries for system apps 
am: 85a91def5c

Change-Id: Iea6f0e3809bc5e4c77a1d5d83be67d6c285bea65
 2016-08-30 01:48:45 +00:00
TreeHugger Robot
689c92db9d Merge "update shared libraries for system apps" into nyc-dev 2016-08-30 01:44:31 +00:00
John Reck
25c6b37613 Merge "Cherry pick TextureView fixes" into nyc-dev 
am: 8eaa65b867

Change-Id: Iaf8ab16f6a1421ff6a19bf81a54b82111f6747f4
 2016-08-29 23:41:44 +00:00
Chris Craik
05cb60846c Cherry pick TextureView fixes 
am: 2e8a8a2432

Change-Id: I1ae3cdc7181e9bef40e38204ede002de973dee98
 2016-08-29 23:41:42 +00:00
John Reck
8eaa65b867 Merge "Cherry pick TextureView fixes" into nyc-dev 2016-08-29 23:33:57 +00:00
Todd Kennedy
85a91def5c 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 6058df65e6)
 2016-08-29 22:50:49 +00:00
Yohei Yukawa
15946bd93c Merge "Make sure IME focus is synced to View focus" into nyc-dev 
am: b7efddfc41

Change-Id: I6a5c98b87dffb4cd3db5e434743b463142a50e1d
 2016-08-29 22:49:24 +00:00
Yohei Yukawa
ef53c0f5ec Make sure IME focus is synced to View focus 
am: 8eb07090a4  -s ours

Change-Id: I32b177a7ea77566ed7b2f1808398b70c64bb756d
 2016-08-29 22:45:50 +00:00
TreeHugger Robot
b7efddfc41 Merge "Make sure IME focus is synced to View focus" into nyc-dev 2016-08-29 22:35:23 +00:00
Chet Haase
6a8b5585aa Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev 
am: 59fb472858

Change-Id: I68cef7811c79e264c685fcaae30b501d29789af5
 2016-08-29 22:31:37 +00:00
Yuichi Biwa
96ecd77dc8 ChooserActivity: Cannot start app that the icon overflows the layout 
am: cb3e1237b5

Change-Id: I93bb2ff3a13f31f6ce6d2ab7161eba3f1be17999
 2016-08-29 22:31:33 +00:00
Chet Haase
26849eca9c Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev 
am: 22e006214c

Change-Id: Ib19c9f7c09574796d8446f2195323d78aa6b8811
 2016-08-29 22:31:28 +00:00
Alan Viverette
54e7cbe563 Set up view state before attaching, jump drawables if needed 
am: c328f042a6  -s ours

Change-Id: If8eeea4957a19389c9fea47bd0b31dbcc5d51b21
 2016-08-29 22:31:24 +00:00
Chet Haase
373f7c04fd Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev 
am: a1bbb76806

Change-Id: I1f1d1efab0844204df403fdc7619b6c6d8b1fb77
 2016-08-29 22:31:20 +00:00
Adam Powell
96bdf5ca7b Force AlertDialogLayout to have gravity start|top 
am: 00c4f7ba65

Change-Id: If329f03f0475cb0b65ed62d97ee97285f8d24038
 2016-08-29 22:31:16 +00:00
Chet Haase
6ff5fafeca Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev 
am: c80a4d7ae3

Change-Id: I39589f091b9f34581f20323e721a3d1ab2887c32
 2016-08-29 22:31:09 +00:00
Abodunrinwa Toki
cba50af05e FloatingActionMode: Fix screen coordinates. 
am: 99c340cad9

Change-Id: If69592a88c5296d1321a08d78231492efaac6645
 2016-08-29 22:31:04 +00:00
Chet Haase
59fb472858 Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev 2016-08-29 22:13:12 +00:00
Chet Haase
22e006214c Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev 2016-08-29 22:12:09 +00:00
Chet Haase
a1bbb76806 Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev 2016-08-29 22:11:27 +00:00
Chet Haase
c80a4d7ae3 Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev 2016-08-29 22:11:09 +00:00
Christopher Tate
e9ca3ec441 Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev 
am: 2bbfe98062

Change-Id: I05c5b636f7edec76ab85c4e9b9d248c41acb4157
 2016-08-29 21:55:38 +00:00
Christopher Tate
ef05b70110 Eliminate next-alarm-clock broadcast flapping 
am: c60da1edc1

Change-Id: Id45dadd7ccebf91435e197f86f5fba71127c0986
 2016-08-29 21:55:30 +00:00
TreeHugger Robot
2bbfe98062 Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev 2016-08-29 21:47:04 +00:00
Pankaj Kanwar
d5b8c80b51 Merge "Update InCallService#onConnectionEvent comments." into nyc-dr1-dev 2016-08-29 21:37:42 +00:00
Chris Craik
2e8a8a2432 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 391d560402)

TextureView: destroy layer on destroyHardwareResources event

bug:30468770

(cherry picked from commit 1c16c37d86)

Fix NPE in TextureView

Bug: 30651595

(cherry picked from commit 3c2587f26e)

Fix NPE in TextureView

Bug: 30779663

(cherry picked from commit 7e237189c2)

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 03df0834e6)
 2016-08-29 14:22:13 -07:00
Andrii Kulian
2f1662f524 Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev 
am: c8417676ed

Change-Id: I74e1b45ce3eaf9edec6fb60394da3ad8a818d214
 2016-08-29 21:17:02 +00:00
Andrii Kulian
35c3c8ee8d DO NOT MERGE -- Fix finishing activity in non-focused stack 
am: 772c598f66

Change-Id: I890f3b460787682bbe0fdb4d8ce44364f1839dac
 2016-08-29 21:16:59 +00:00
TreeHugger Robot
c8417676ed Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev 2016-08-29 21:10:34 +00:00
Christopher Tate
c60da1edc1 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 76389c00d3)
 2016-08-29 19:44:55 +00:00
Tao Bao
18f9533910 Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4 
am: c5a17fc39f

Change-Id: Ib637e1f00ddebbac5a3bea6ff31f08854a95b7ea
 2016-08-29 19:34:23 +00:00
Tao Bao
c5a17fc39f Bump up the uncrypt timeout to 30 min. 
am: 8abcfed8a4

Change-Id: I35340614fe09f96f8c31cc53a99e366580294490
 2016-08-29 19:26:43 +00:00
Andrii Kulian
934da4e400 Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev 
am: 128a4419e9

Change-Id: I6c28db82c53af5a68c3d875ecca920b9a1364b32
 2016-08-29 18:51:55 +00:00
Andrii Kulian
febd5c027c DO NOT MERGE -- Correctly finish activity in non-focused stack 
am: 620040db3f  -s ours

Change-Id: I62703cc7f62bf42967021ce8defa30669e096ec2
 2016-08-29 18:44:11 +00:00
Andrii Kulian
772c598f66 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 995fa2bd2d)
 2016-08-29 18:30:46 +00:00
Andrii Kulian
128a4419e9 Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev 2016-08-29 18:30:10 +00:00
Jason Monk
db2d30e1b9 Merge "Fix double status bar icons" into nyc-dev 
am: 2b4e612b10

Change-Id: Ib0d9e51d289215d96525b68d0432b959e9b58f2f
 2016-08-29 18:26:00 +00:00
Jason Monk
447991c67a Fix double status bar icons 
am: 12124d7eca

Change-Id: Ief00496f19d2e249129023a03cd9f53d76fa7bf8
 2016-08-29 18:25:57 +00:00