drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,399 Commits 1 Branch 0 Tags
Commit Graph

173399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
aa87e89e81 Merge "Choose the right executable for wrapped applications." 2015-01-21 14:01:57 +00:00
louis_chang
2d094e9477 [ActivityManager] No home activity resumed and cause 
key dispatch ANR

Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.

Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.

Solution:
Just resume the next activity if already in home stack

Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354
 2015-01-21 19:01:52 +08:00
Erik Kline
338317edd5 Log interface name and uid when filtering a blocked network. 
Bug: 18707263
Change-Id: Ide9a1670a97eae787b785933de0c80750c2b5601
 2015-01-21 12:02:11 +09:00
Jinsuk Kim
748e813ed7 am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 
automerge: f8d2f32

* commit 'f8d2f3284f9613bc20967e19213573804ea0ab83':
  CEC: Switch active input after routing control
 2015-01-21 02:33:08 +00:00
Jinsuk Kim
f8d2f3284f am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 
* commit 'f23829d64ff6fdae6f8b1d2b0fbe3f2715b313d4':
  CEC: Switch active input after routing control
 2015-01-21 02:16:37 +00:00
Jinsuk Kim
f23829d64f Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 2015-01-21 02:10:54 +00:00
Dianne Hackborn
734f68439e Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev automerge: 66f8d9b 
automerge: 8781dbf

* commit '8781dbf3dfa79c39fc0410521dff04156fae876a':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 00:43:50 +00:00
Jinsuk Kim
337ce19bef CEC: Switch active input after routing control 
Makes sure the previous HDMI input gets switched to upon receiving
<Inactive Source> from the current active source device.

Bug: 18986597
Change-Id: I7120e81d75b5fd4cafd4b483e9b232b96e50f597
 2015-01-21 09:38:33 +09:00
Ying Wang
02937eba32 Check in "current" system API files. 
The API files were generated by running "make showcommands update-system-api".

Bug: 18960664
Change-Id: Ibb4756d98be3cbf67f6103f5d5d8ff060b3c34c9
 2015-01-20 16:30:47 -08:00
Dianne Hackborn
8781dbf3df Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev 
automerge: 66f8d9b

* commit '66f8d9bb693d5e410ac6f6ba3029cf6c7dc2f104':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 00:27:47 +00:00
Dianne Hackborn
66f8d9bb69 Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev 2015-01-21 00:23:53 +00:00
Andrew Solovay
f92dbe0115 docs: WebView security notes for apps on pre-K devices 
Added paragraph describing security precautions for apps that use
WebView on devices running versions older than Android 4.4. See first
comment for doc stage location.

bug: 19075466
Change-Id: I69937d8dfc37ec1ba693f969500b9dc7404c4635
 2015-01-20 16:10:07 -08:00
Geoff Mendal
6bf768bf13 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2015-01-20 23:58:17 +00:00
Craig Mautner
b880c75eeb am f1eb1cdc: am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 
* commit 'f1eb1cdc65376ea32ece4f7a4c750abe48c9f3c7':
  Revert "Remove debugging and skip InputMethod windows"
 2015-01-20 23:58:05 +00:00
Craig Mautner
07d2f0cff4 am 1388342c: am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
* commit '1388342c7f6e9c235d31b01edf3716e83fad3e64':
  More debugging for bug 17721767
 2015-01-20 23:58:00 +00:00
Craig Mautner
d93597cee1 am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
automerge: 1388342

* commit '1388342c7f6e9c235d31b01edf3716e83fad3e64':
  More debugging for bug 17721767
 2015-01-20 23:56:48 +00:00
Christopher Tate
ebdec3e092 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev 
automerge: 8192670

* commit '8192670937e3dee8e2c521a9ed1118a5782a2912':
  Don't launch broadcast receiver processes during boot
 2015-01-20 23:55:00 +00:00
Christopher Tate
fb4fde7053 Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6 
automerge: 78a05de

* commit '78a05de82daffdf746c252b49f12ef88073b0459':
  Don't try to launch broadcast receivers during boot
 2015-01-20 23:52:57 +00:00
Sanket Padawe
f0f5eee823 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 
automerge: 76e9d18

* commit '76e9d18055d131bede49886c9c86c9f59db3fac4':
  Fixed a crash in TelephonyManager while calling getDeviceID()
 2015-01-20 23:49:54 +00:00
Jinsuk Kim
00959a56e5 am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 
automerge: 375ae7b

* commit '375ae7ba3263ee8eceeb371b170e9181c801c612':
  Mark TimeUnit as @SystemApi
 2015-01-20 23:47:44 +00:00
Craig Mautner
f1eb1cdc65 am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 
* commit 'd22c8d9961340ba1b7d7601d1c99e2557b6a9f0b':
  Revert "Remove debugging and skip InputMethod windows"
 2015-01-20 23:12:33 +00:00
Craig Mautner
1388342c7f am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
* commit '088bf3a37a329962efb5e5a42c82f32a2dab77fe':
  More debugging for bug 17721767
 2015-01-20 23:12:29 +00:00
Christopher Tate
8192670937 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev 
* commit '77c96dd80ac25f91b226eff70034c1a4e81e593b':
  Don't launch broadcast receiver processes during boot
 2015-01-20 23:12:24 +00:00
Craig Mautner
d22c8d9961 Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 2015-01-20 23:07:56 +00:00
Christopher Tate
78a05de82d Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev 
automerge: 14c33f6

* commit '14c33f6a716f224d1bc821cd8aa062f5734c29bf':
  Don't try to launch broadcast receivers during boot
 2015-01-20 23:02:23 +00:00
Sanket Padawe
76e9d18055 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev 
automerge: e54e760

* commit 'e54e760477b95aa0396c3abb2b7452410782b147':
  Fixed a crash in TelephonyManager while calling getDeviceID()
 2015-01-20 22:58:29 +00:00
Craig Mautner
088bf3a37a Merge "More debugging for bug 17721767" into lmp-mr1-dev 2015-01-20 22:57:42 +00:00
Dianne Hackborn
cff1bbf46c Fix issue #19020826: Including timing issues in ANR reason breaks clustering 
Also improve service ANR debugging.

Change-Id: I2118ef2811ca3ba676c110639f58d5c21abfb8eb
 2015-01-20 14:56:09 -08:00
Christopher Tate
77c96dd80a Merge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev 2015-01-20 22:55:16 +00:00
Christopher Tate
14c33f6a71 Merge "Don't try to launch broadcast receivers during boot" into lmp-mr1-dev 2015-01-20 22:54:53 +00:00
Sanket Padawe
e54e760477 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev 2015-01-20 22:50:03 +00:00
Craig Mautner
6673d09a8a Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev automerge: d9a79b5 
automerge: 03d7cc3

* commit '03d7cc3c24e7d89d82394c9d0cfc8e0c3423687f':
  Remove debugging and skip InputMethod windows
 2015-01-20 22:45:50 +00:00
Jinsuk Kim
375ae7ba32 am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 
* commit '054f2656a17a438aa6e8c8f6dcd61b1217f41b88':
  Mark TimeUnit as @SystemApi
 2015-01-20 22:43:34 +00:00
Craig Mautner
a3342991a7 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 
automerge: 07317da

* commit '07317da6834cc35fe8fad519bb60f15ba68bcd48':
  Do not defer removal for empty tasks or activities
 2015-01-20 22:43:32 +00:00
Sanket Padawe
201cc00947 Fixed a crash in TelephonyManager while calling getDeviceID() 
Bug: 19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
 2015-01-20 14:40:14 -08:00
Jinsuk Kim
054f2656a1 Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 2015-01-20 22:39:53 +00:00
Craig Mautner
03d7cc3c24 Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev 
automerge: d9a79b5

* commit 'd9a79b5ba9934429289a634bdd4ad1a375484184':
  Remove debugging and skip InputMethod windows
 2015-01-20 22:35:57 +00:00
Craig Mautner
ea343e5f67 Revert "Remove debugging and skip InputMethod windows" 
This reverts commit 668cae1d4724cf794571f1ee2a3e896984b97db7.

Too soon. I need this for debug.

Change-Id: Ibeaec0139f511cf389049bdb7dae368a7bd8186b
 2015-01-20 22:35:25 +00:00
Craig Mautner
d9a79b5ba9 Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev 2015-01-20 22:34:01 +00:00
Jinsuk Kim
28d2a693ef Mark TimeUnit as @SystemApi 
Bug: 18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
 2015-01-21 07:33:40 +09:00
Craig Mautner
07317da683 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 
* commit 'cbb286b8594c56161f2765023a73d8200e426f9b':
  Do not defer removal for empty tasks or activities
 2015-01-20 22:32:16 +00:00
Christopher Tate
0721a94630 Don't try to launch broadcast receivers during boot 
It turns out that sysUI visibility / interactivity is racing with
boot, and it's possible in some circumstances for the user to start
the secure camera swipe gesture before formal boot-completed.  Make
sure we only send the camera-related broadcast to registered
receivers in that case, otherwise we'll implicitly be asking to
launch other apps before boot, which is forbidden.

Bug 19060618

Change-Id: I7fcf13b5af7b2edfbb4aac06ef04a0fde2c6a0f7
 2015-01-20 14:29:22 -08:00
Craig Mautner
cbb286b859 Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 2015-01-20 22:26:11 +00:00
Christopher Tate
267603f3bb Don't launch broadcast receiver processes during boot 
Broadcasts that might be sent before the boot process has completed must
be restricted to registered receivers, at least while still in the
middle of booting.

Bug 19060618

Change-Id: Ib4e0990cf252f34344f7a0bd19a0e72919013e0f
 2015-01-20 14:21:21 -08:00
Ying Wang
43df3c6c19 am b5108949: am e4a031e3: Merge "New trick to install bad dex file." 
* commit 'b51089499c8c39fce47deccf70d3ea069c58b471':
  New trick to install bad dex file.
 2015-01-20 22:01:26 +00:00
Craig Mautner
0c4d81cf13 Do not defer removal for empty tasks or activities 
It is possible for empty activities to be leaked if their last
window is removed before animations finish. This change keeps tasks
and activities from having removal deferred if they have no windows.

Fixes bug 19047432

Change-Id: If6562f46bbfcac9ba987e2c834a1d55a9a8f3766
 2015-01-20 13:57:27 -08:00
Adam Lesinski
d9bd08864e am aee7225e: Merge "Process base APK" into lmp-mr1-dev 
automerge: 554a6f5

* commit '554a6f5278ec05077d8252249afc911897fbfe76':
  Process base APK
 2015-01-20 21:55:12 +00:00
Ying Wang
b51089499c am e4a031e3: Merge "New trick to install bad dex file." 
* commit 'e4a031e3c3b234ff91ce62e95b788eca7e00082c':
  New trick to install bad dex file.
 2015-01-20 21:50:14 +00:00
Adam Lesinski
554a6f5278 am aee7225e: Merge "Process base APK" into lmp-mr1-dev 
* commit 'aee7225e34376a90e8c25e5df53604085cc1b712':
  Process base APK
 2015-01-20 21:48:03 +00:00
Christopher Tate
a9c122af60 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge: 7651dcb 
automerge: 5afc62c

* commit '5afc62cd39403c12a253101b12c52f440843bdaf':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:45:08 +00:00