Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,814 Commits 3 Branches 0 Tags
7489271cd12ef04ba19cd2ea31a1e79251b10a08
Commit Graph

119814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Kilbourn
7489271cd1 am c405bae9: am 7071786e: Clear child FragmentManagers when destroying Fragments. 
* commit 'c405bae90d861a2487367c34b1a2ebd695da340d':
  Clear child FragmentManagers when destroying Fragments.
 2014-02-28 20:16:09 +00:00
Tim Kilbourn
c405bae90d am 7071786e: Clear child FragmentManagers when destroying Fragments. 
* commit '7071786e0074bea42b01236f817383cab69c1b63':
  Clear child FragmentManagers when destroying Fragments.
 2014-02-28 20:13:11 +00:00
Narayan Kamath
d8ccf8b789 am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit 'be094d89db01387f773786435e110bbe166f3c65':
  Various format string fixes for 64bit
 2014-02-28 13:50:57 +00:00
Narayan Kamath
be094d89db am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
  Various format string fixes for 64bit
 2014-02-28 13:46:53 +00:00
Narayan Kamath
8fb22ae772 am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit 'eee2c72f96cd4e6228c50c8b461b4dd84a9f4538':
  Various format string fixes for 64bit
 2014-02-28 05:45:01 -08:00
Narayan Kamath
eee2c72f96 Merge "Various format string fixes for 64bit" 2014-02-28 13:41:58 +00:00
Narayan Kamath
62d675c240 am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit '0d3548bea9986bb7446156699e200ffa147a3a02':
  AArch64: Use long[] for RS id array
 2014-02-28 13:31:58 +00:00
Narayan Kamath
0d3548bea9 am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit 'd138029d92e1d4657815747f30004323061d34de':
  AArch64: Use long[] for RS id array
 2014-02-28 13:28:30 +00:00
Narayan Kamath
d138029d92 am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit '14420e29abc0f16f818ddaf606515861ba69ae68':
  AArch64: Use long[] for RS id array
 2014-02-28 05:26:30 -08:00
Narayan Kamath
14420e29ab Merge "AArch64: Use long[] for RS id array" 2014-02-28 13:22:26 +00:00
Jeff Brown
098bed6f27 am bb689496: am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent. 
* commit 'bb6894964b30d02dc3545f07b45140646ef17581':
  Make meaning of PowerManager.isScreenOn() more consistent.
 2014-02-28 09:40:28 +00:00
Jeff Brown
bb6894964b am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent. 
* commit '4c7e6900c8bfd57652fc1ceca724208ca7556196':
  Make meaning of PowerManager.isScreenOn() more consistent.
 2014-02-28 09:21:36 +00:00
Tim Kilbourn
7071786e00 Clear child FragmentManagers when destroying Fragments. 
If Fragment has instantiated a child FragmentManager and is later
detached, it retains its reference to the child FragmentManager which
has been destroyed. This causes an IllegalStateException in the
child FragmentManager if the original Fragment is reattached.

Fixes Issue 42601.

Change-Id: I8db2b1a110a341dc259939723f4c5ec131ca5f1e
 2014-02-28 01:05:17 -08:00
Jeff Brown
4c7e6900c8 Make meaning of PowerManager.isScreenOn() more consistent. 
The power manager sends SCREEN_ON and SCREEN_OFF broadcasts
purely based on the current wakefulness state.  In particular,
when the system is awake, we consider the screen to be on even
if the screen may actually be off due to the proximity sensor
or some other condition.  Likewise when the system is dozing
or asleep, we consider the screen to be off although technically
it may still be on and dozing.

This behavior is maintained for compatibility with applications
that interpret screen on / off as an indicator of user presence.

As it happened, the value of PowerManager.isScreenOn() did not
always match the state indicated by the broadcasts under certain
situations.  Instead, it was based on the desired screen state.
These states used to be closely correlated but the addition
of doze mode causes them to diverge in meaning.

One consequence is that wake events from input devices might not
always wake the device from sleep unless the display's power
state was actually DOZING or OFF even if the power manager's
wakefulness was already DOZING or ASLEEP.  This is now fixed.

Change-Id: Ie819c6d2c5a9ffaaf3101c5dee93ff72e9bc9f30
 2014-02-27 21:17:34 -08:00
Xavier Ducrohet
b2334254ef am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit 'ec84ada6e8f3dad738810e2f1cd085defbc6d0ab':
  Update layoutlib method for SystemClock
 2014-02-27 23:38:23 +00:00
Xavier Ducrohet
ec84ada6e8 am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d':
  Update layoutlib method for SystemClock
 2014-02-27 23:34:34 +00:00
Xavier Ducrohet
5e5602da5f am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit '0c72b76963f7f43a2f986c38831ce76b43c6275a':
  Update layoutlib method for SystemClock
 2014-02-27 15:32:43 -08:00
Xavier Ducrohet
0c72b76963 Merge "Update layoutlib method for SystemClock" 2014-02-27 23:28:14 +00:00
Paul Lawrence
8ba127796e am 43e412cb: am 1dd01130: am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitr 
* commit '43e412cb67ad47c5c9d68ac8cbd12356aca97603':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:37:42 +00:00
Carlos Valdivia
a92eab69d1 am 2cafd66a: am 78ef794d: am dc7dfe2e: am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '2cafd66a57894687867e7ba6623389e0ccc38ade':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:37:40 +00:00
Paul Lawrence
43e412cb67 am 1dd01130: am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activitie 
* commit '1dd01130cd0a3a43fac14da3a998ae0ac282cf80':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:34:30 +00:00
Carlos Valdivia
2cafd66a57 am 78ef794d: am dc7dfe2e: am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '78ef794d2d7051e554a83f802a187f563bd1425e':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:34:28 +00:00
Paul Lawrence
1dd01130cd am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'e2b220e8c50a7f51edd85e26a3084d9b525587a7':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:32:04 +00:00
Carlos Valdivia
78ef794d2d am dc7dfe2e: am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'dc7dfe2e63a03a7bc057a83bf795dbc4fc869479':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:32:01 +00:00
Paul Lawrence
e2b220e8c5 am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '0619edd3f3b144a9664e8e588285f9351dc2dd96':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:28:50 +00:00
Carlos Valdivia
dc7dfe2e63 am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'b675b474d1838189adc4dfa0e5e1ba1598c82dad':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:28:47 +00:00
Paul Lawrence
0619edd3f3 am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '7ab82a0c602956251be9dd5539208af9cfecea33':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:24:42 +00:00
Carlos Valdivia
b675b474d1 am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '9395f63aa5a386088ad93e3e226ef333084c5b74':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:24:39 +00:00
Paul Lawrence
7ab82a0c60 am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '657dbc40427c17cbf31be1a17cf2fa7a4116722a':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:21:05 +00:00
Carlos Valdivia
9395f63aa5 am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '55cab009f0c9b1939f8336e26144850a5fdc9d3a':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 22:21:01 +00:00
Christopher Tate
4522bd12a4 am a58c03f6: am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application" 
* commit 'a58c03f603cd90d1fed5566c88af5cd6c6f4caf5':
  Fixed upgrading from forward-lock application to system application
 2014-02-27 22:12:39 +00:00
Christopher Tate
a58c03f603 am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application" 
* commit '41bfe121cfa889df803a8916000e1fd0fbe87d5a':
  Fixed upgrading from forward-lock application to system application
 2014-02-27 22:09:18 +00:00
Christopher Tate
41bfe121cf am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application" 
* commit '16678ac66f7e6d5ce414536b7534d1e823f7ab30':
  Fixed upgrading from forward-lock application to system application
 2014-02-27 14:06:32 -08:00
Christopher Tate
16678ac66f Merge "Fixed upgrading from forward-lock application to system application" 2014-02-27 22:01:29 +00:00
Paul Lawrence
657dbc4042 am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'b37768816cd9c530dcbb3a8f51d87536406a975b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 12:04:07 -08:00
Paul Lawrence
b37768816c am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '8b91693683895a8b148f6ffea8944cef2ba8d99b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 12:00:08 -08:00
Paul Lawrence
8b91693683 am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '2e582d1379fa78e2693269d76d2bcd763bfbfba1':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:55:10 -08:00
Paul Lawrence
2e582d1379 am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:44:37 -08:00
Paul Lawrence
9bce4032e9 am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '08ee74b1f1c4df28faa4168114853836cc471095':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:40:21 -08:00
Paul Lawrence
08ee74b1f1 am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'ea5586ef7fc29463f8144931c2c43261d15043b1':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:38:01 -08:00
Paul Lawrence
ea5586ef7f am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '4be7c61a339f8200527f6df5a7b2215c96f81b4b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:28:43 -08:00
Paul Lawrence
4be7c61a33 am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '5677513b7c46ca08a7fa34b9d227d7a448db6757':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:24:05 -08:00
Carlos Valdivia
55cab009f0 am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '9272db024d013fbb48ec476c77562ab31d75a461':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:22:53 -08:00
Paul Lawrence
5677513b7c am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:20:24 -08:00
Carlos Valdivia
9272db024d am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'c45bd7f20987ed2fd29b9192edb38d02b4caa23b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:17:11 -08:00
Paul Lawrence
da37ed8b0a am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:16:49 -08:00
Paul Lawrence
b9ba0c6c43 Prevent authenticators from using Settings to launch arbitrary activities. 
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.

The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature.  This means that an authenticator implementer can only
exploit apps they control.

This is a backport of 5bab9daf3c

Bug: 7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
 2014-02-27 09:09:48 -08:00
Carlos Valdivia
c45bd7f209 Prevent authenticators from using Settings to launch arbitrary activities. 
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.

The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature.  This means that an authenticator implementer can only
exploit apps they control.

Bug: 7699048
Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
(cherry picked from commit 5bab9daf3c)
 2014-02-27 17:03:15 +00:00
Narayan Kamath
7aec4109c5 am 7aeb4307: am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '7aeb43072a9fb9b0a7078a390cb4a729321bf117':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-02-27 13:30:08 +00:00
Narayan Kamath
7aeb43072a am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '2525acf5a9855d748c008268bb26d6f6d5045d84':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-02-27 13:26:39 +00:00