Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,999 Commits 3 Branches 0 Tags
f77b381b9bb990f8ce22df177b18e9d1260b57a3
Commit Graph

59731 Commits

Author SHA1 Message Date
Lorenzo Colitti
f77b381b9b Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev am: 1d3c594 am: 7146d02 
am: c097c93

* commit 'c097c9377e6a7e2f6577dd374dc218ef4f57c2eb':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: Iced513171ceb6e3e1c4fea545786e59b8c64b40a
 2016-04-28 05:30:58 +00:00
Jorim Jaggi
2f5e3ddf9e Merge changes Idb555b01,If8acf31b into nyc-dev am: 831ecc8 am: 1601067 
am: 4398aad

* commit '4398aad9542ff58df6ac2aa38f5e31f18021a306':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ib5a88c47ef73b461fb1d09b45e4763b0d6512666
 2016-04-28 05:30:56 +00:00
TreeHugger Robot
c097c9377e Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev am: 1d3c594 
am: 7146d02

* commit '7146d02910808367f30c82b7b05d757b47a2bc66':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: I2c0625395528fe4984cd18f5b34981b9ef0e9969
 2016-04-28 05:28:03 +00:00
TreeHugger Robot
4398aad954 Merge changes Idb555b01,If8acf31b into nyc-dev am: 831ecc8 
am: 1601067

* commit '16010672874c7fbacd248c87a31396f7d8222334':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ifa8fb6f3c0c98a74b959be82a523dd4987a0d9d5
 2016-04-28 05:28:00 +00:00
TreeHugger Robot
1d3c59457c Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev 2016-04-28 04:01:11 +00:00
Lorenzo Colitti
c5be12e7ac Make isCaptivePortal perform both HTTP and HTTPS probes. 
Also a couple of minor cleanups and logging tweaks.

Bug: 26075613
Change-Id: I67b09e96d72764179339b616072bb2ce06aabf33
 2016-04-28 11:23:10 +09:00
Jorim Jaggi
c875ae74ba Don't move forced resizable info activity to the front 
If we start the forced resizable activity with an existing task,
avoid moving that task to the front. This can cause that a previous
task that was moved to the back gets moved to the front again just
because we started that activity. That's not good.

Bug: 28223489
Change-Id: If8acf31b8be98b82665de1015d5621331c37fb64
 2016-04-27 19:19:04 -07:00
Dianne Hackborn
b5271598ff Merge "Fix issue #28431297: Crash in system process" into nyc-dev am: 1a2f993 am: 2501220 
am: 8aad038

* commit '8aad0386145df5a11cc9140a4b7e8d4588e64aa5':
  Fix issue #28431297: Crash in system process

Change-Id: Ibfe02253fe0a4d4981680e58de4d90422e05c9e0
 2016-04-28 01:36:40 +00:00
Christopher Tate
89f543c5f5 Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev am: 0731806 am: 3218e95 
am: 77ea251

* commit '77ea25191f96c71c634fb1cc8589f83140a79233':
  Make sure FIRST_LAUNCH is after PACKAGE_ADDED

Change-Id: Ic386fa6ce64fbbe52b377105891c3904c3f48011
 2016-04-28 01:36:01 +00:00
Dianne Hackborn
8aad038614 Merge "Fix issue #28431297: Crash in system process" into nyc-dev am: 1a2f993 
am: 2501220

* commit '2501220e1f473752b5eadc663f7486668e9b9fc6':
  Fix issue #28431297: Crash in system process

Change-Id: Icae0787b41e5c47339496e0c08457e331e37162f
 2016-04-28 01:22:01 +00:00
Dianne Hackborn
1a2f993ba5 Merge "Fix issue #28431297: Crash in system process" into nyc-dev 2016-04-28 01:07:26 +00:00
Badhri Jagan Sridharan
bc07967a69 Merge "Add low power stats to batteryhistory" into nyc-dev am: 5149abe am: b0ec5e2 
am: 90edbf9

* commit '90edbf9a2c5d5eec58643fee9c485b79910b3896':
  Add low power stats to batteryhistory

Change-Id: If3b2f1145ca38e05bf880d6471c1467d195edede
 2016-04-28 00:58:08 +00:00
Adrian Roos
689e06f392 Merge "Fix MessagingStyle HUNs" into nyc-dev am: 5aa8e7d am: 4dd8578 
am: 1732ce4

* commit '1732ce493f6c0b8977558bef1885b1ecc8841f18':
  Fix MessagingStyle HUNs

Change-Id: I649b4fc0336abe2aedbc185f77afb68755a5b5b1
 2016-04-28 00:57:18 +00:00
Selim Cinek
94cc8e64cb Merge "Handle empty bigTexts more gracefully" into nyc-dev am: 1689203 am: b12c2e9 
am: ad4b7f0

* commit 'ad4b7f0f81e4b9ff0d458000efcbe4ad008d13ad':
  Handle empty bigTexts more gracefully

Change-Id: Ic7f71f14142d51fb33b7fc3d4f5609e27f42c3e3
 2016-04-28 00:53:54 +00:00
Chris Tate
77ea25191f Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev am: 0731806 
am: 3218e95

* commit '3218e958471db4f7e5bd8dd79ea61d027f290d99':
  Make sure FIRST_LAUNCH is after PACKAGE_ADDED

Change-Id: If73c0b06730d06217f83d84feaed28e8d199b955
 2016-04-28 00:53:40 +00:00
Phil Weaver
e58aa16282 Merge "Fix several accessibility magnification issues." into nyc-dev am: 1f70f0b am: 44e272b 
am: 5a4be4d

* commit '5a4be4d8a26e844ade76f836163de6c4047ca263':
  Fix several accessibility magnification issues.

Change-Id: I362ed6a9717465668120e75d63ca3e07ab7c7c4d
 2016-04-28 00:53:24 +00:00
Felipe Leme
d5890f2f7d Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev am: 0db93ce am: 3b17597 
am: 479c9bb

* commit '479c9bbaf971aab9d3ac50acebe41158e53ee342':
  Tethering and Data Saver: There Can Be Only One!

Change-Id: I184d03847abe86dd2f5e10c10bd12f90f7cc14d8
 2016-04-28 00:52:46 +00:00
Adam Powell
123ad32f17 Merge "Don\'t lose content change during rollback for loader already started" into nyc-dev am: 8ff7d16 am: a3aef2a 
am: fa8d696

* commit 'fa8d696556fa4124953de9be41fd495c748c9f76':
  Don't lose content change during rollback for loader already started

Change-Id: I8f2bfdd63962bc1c83ed68bc43622d06b228a185
 2016-04-28 00:51:01 +00:00
Chris Tate
07318065b2 Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev 2016-04-28 00:41:02 +00:00
Dianne Hackborn
e761777323 Fix issue #28431297: Crash in system process 
Don't allow null URIs to get put into the notification path.

Change-Id: I4f68f438960c8a90c7b417feaa2e19968a3a200a
 2016-04-27 17:03:52 -07:00
Badhri Jagan Sridharan
b0ec5e2114 Merge "Add low power stats to batteryhistory" into nyc-dev 
am: 5149abe

* commit '5149abe73eb52e5b0df16572397a58c295e23da3':
  Add low power stats to batteryhistory

Change-Id: I9778ada1ccc73041f4682c29d9c8d4ad1bf9e5c1
 2016-04-27 23:51:39 +00:00
Badhri Jagan Sridharan
5149abe73e Merge "Add low power stats to batteryhistory" into nyc-dev 2016-04-27 23:32:19 +00:00
Adrian Roos
4dd85783ca Merge "Fix MessagingStyle HUNs" into nyc-dev 
am: 5aa8e7d

* commit '5aa8e7d1f12f78dde892bdc6698550e8d1c558c4':
  Fix MessagingStyle HUNs

Change-Id: Ia69ff8eb3ab8a650af205b17e8f64bc877b7df64
 2016-04-27 23:32:18 +00:00
Selim Cinek
b12c2e98e9 Merge "Handle empty bigTexts more gracefully" into nyc-dev 
am: 1689203

* commit '1689203d5cc33c2490169d7998cf3ffbeb5d35fc':
  Handle empty bigTexts more gracefully

Change-Id: I3e81fdf19cdb4dd9a81e7cd1e1fd61769de0fdf1
 2016-04-27 23:31:59 +00:00
Phil Weaver
44e272b469 Merge "Fix several accessibility magnification issues." into nyc-dev 
am: 1f70f0b

* commit '1f70f0b7d60ad0b98fe6597162769bce8b85e3ed':
  Fix several accessibility magnification issues.

Change-Id: Ib174d8ff353fd990c5b3119b0728ec942784fbdc
 2016-04-27 23:31:54 +00:00
Felipe Leme
3b17597fc5 Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev 
am: 0db93ce

* commit '0db93cea0fef6aa73caa0ef422b8e0a4e45a24e5':
  Tethering and Data Saver: There Can Be Only One!

Change-Id: I876c9a30e9451b1c346296c233068bdfb579f584
 2016-04-27 23:31:49 +00:00
Adam Powell
a3aef2a2b1 Merge "Don\'t lose content change during rollback for loader already started" into nyc-dev 
am: 8ff7d16

* commit '8ff7d162c624f9889a8e90ac10b6b554869fef6e':
  Don't lose content change during rollback for loader already started

Change-Id: Ia0ac5631a4f0368121bfeda9d1e74b16d5cf0c31
 2016-04-27 23:31:37 +00:00
Adrian Roos
975c918d24 Merge "Fix remote input view clobbering" into nyc-dev 
am: 1a101db

* commit '1a101dbc81151942eafaa95762c2e3fd53ceb05f':
  Fix remote input view clobbering

Change-Id: I5166a5594e846576f395031978490be5aa412cd9
 2016-04-27 23:31:30 +00:00
Adrian Roos
30ae27011b Merge "Fix remote input view clobbering" into nyc-dev am: 1a101db am: 326475cd 
am: d8053d0

* commit 'd8053d042a108a471bc4dc632af8a107575d98d2':
  Fix remote input view clobbering

Change-Id: Ifd5054cb7455ffa0cce94e405e1bf726fe8ccb57
 2016-04-27 23:26:16 +00:00
Alan Viverette
9cd773733c Merge "Always account for divider height when calculating list height" into nyc-dev am: fab88ea am: 958f6002 
am: de613b2

* commit 'de613b2860b9ba3c916061876a3bf2fdd8123662':
  Always account for divider height when calculating list height

Change-Id: I1abfe8823e029d3c52c629a32b351f6b9985d134
 2016-04-27 23:25:31 +00:00
Phil Weaver
ba0f8892d2 Merge "Support zero-length paths for a11y gestures." into nyc-dev am: d803d73 am: 7ae8a52 
am: 66e1e24

* commit '66e1e24bebc61a583107023a928cba92951185af':
  Support zero-length paths for a11y gestures.

Change-Id: If9b671a652cea212edf36aa1e736528e7df70cda
 2016-04-27 23:25:15 +00:00
Robert Carr
835eb2c0ad Merge "Fix crash when docking." into nyc-dev am: 45ee78c am: 6ad9739 
am: 88df0dd

* commit '88df0dd3efeba73dda2d436fdb93d3e4ebe88765':
  Fix crash when docking.

Change-Id: Iae8e8801ab0e237dd25c26854588020778ce74f8
 2016-04-27 23:24:55 +00:00
Adrian Roos
5aa8e7d1f1 Merge "Fix MessagingStyle HUNs" into nyc-dev 2016-04-27 23:17:08 +00:00
Selim Cinek
1689203d5c Merge "Handle empty bigTexts more gracefully" into nyc-dev 2016-04-27 22:59:03 +00:00
Phil Weaver
1f70f0b7d6 Merge "Fix several accessibility magnification issues." into nyc-dev 2016-04-27 22:50:37 +00:00
TreeHugger Robot
0db93cea0f Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev 2016-04-27 22:41:13 +00:00
TreeHugger Robot
d8053d042a Merge "Fix remote input view clobbering" into nyc-dev am: 1a101db 
am: 326475cd

* commit '326475cdb42b7b50ff80e175b450cd43af531924':
  Fix remote input view clobbering

Change-Id: Ieb9b6490e115a5cb91059b0499d520a1e9b38035
 2016-04-27 22:27:43 +00:00
TreeHugger Robot
8ff7d162c6 Merge "Don't lose content change during rollback for loader already started" into nyc-dev 2016-04-27 22:25:38 +00:00
TreeHugger Robot
1a101dbc81 Merge "Fix remote input view clobbering" into nyc-dev 2016-04-27 22:17:33 +00:00
The Android Automerger
750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115 2016-04-27 22:14:50 +00:00
Christopher Tate
5cf5578a45 Make sure FIRST_LAUNCH is after PACKAGE_ADDED 
If an app undergoes restore during install, it is considered 'started'
and the FIRST_LAUNCH broadcast needs to go out.  However, this must not
take place until after the restore operation has fully completed, in
order to avoid publishing the app's existence while it may still be in
an incoherent state.  We now make this broadcast part of POST_INSTALL
in the restore case.

Bundled apps are in the 'started' state regardless, so no FIRST_LAUNCH
broadcast is ever sent for them -- this CL does not change that
existing behavior even in the case of setup-time data restore of
factory-installed packages.

Bug 28173625

Change-Id: Ibcc3758576662dc447b75476173a0d008a9fe4da
 2016-04-27 15:07:26 -07:00
Alan Viverette
958f60022d Merge "Always account for divider height when calculating list height" into nyc-dev 
am: fab88ea

* commit 'fab88eab310c892654506b3ad6e0eae4c0a8649e':
  Always account for divider height when calculating list height

Change-Id: Ia9b537030d178ff3e14c53f1f01a340135aac1ce
 2016-04-27 22:07:05 +00:00
Phil Weaver
7ae8a529f7 Merge "Support zero-length paths for a11y gestures." into nyc-dev 
am: d803d73

* commit 'd803d73331ee295444cc244415b00b985a2d89ea':
  Support zero-length paths for a11y gestures.

Change-Id: I5397937fb736a66fff2344e636939f503898d64a
 2016-04-27 22:07:01 +00:00
Robert Carr
6ad97390a3 Merge "Fix crash when docking." into nyc-dev 
am: 45ee78c

* commit '45ee78c083906eca68cdade9bc98b64a83372307':
  Fix crash when docking.

Change-Id: Ic2de9854c107886f45024eb4bc620b07b1329a20
 2016-04-27 22:06:54 +00:00
Antonio Cansado
b649d42ecf Merge "Fixing network tags." into nyc-dev am: 2c9bb7c 
am: 72baa83

* commit '72baa83895fa35be96b8dd2f5f5ac4cbdd5c2795':
  Fixing network tags.

Change-Id: I9fc3fb5a2288a2b90132fcf5cd4576000ba5f1c9
 2016-04-27 21:59:13 +00:00
Alan Viverette
fab88eab31 Merge "Always account for divider height when calculating list height" into nyc-dev 2016-04-27 21:50:48 +00:00
TreeHugger Robot
d803d73331 Merge "Support zero-length paths for a11y gestures." into nyc-dev 2016-04-27 21:48:08 +00:00
Antonio Cansado
79335ba880 Merge "Fixing network tags." into nyc-dev 
am: 2c9bb7c

* commit '2c9bb7c09a49442ac871115890f93581aa160d46':
  Fixing network tags.

Change-Id: Ie90d6886bde2182ac81ad1b26bdec93a69565c56
 2016-04-27 21:39:56 +00:00
Rob Carr
45ee78c083 Merge "Fix crash when docking." into nyc-dev 2016-04-27 21:36:53 +00:00
Antonio Cansado
2c9bb7c09a Merge "Fixing network tags." into nyc-dev 2016-04-27 21:28:13 +00:00