Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
7748fd8135 Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" automerge: 247e828 
automerge: ad55787

* commit 'ad55787db2f9e4b56a8406026566564d6aa08d5a':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:09:30 +00:00
Ricardo Cervera
c2be8a6da0 docs: Wear DataItem listener improvements 
Change-Id: I07bf2ab063556dd4f6e42a5835f73dd5b326d26e
 2015-01-21 09:08:53 -08:00
Craig Mautner
ad55787db2 Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" 
automerge: 247e828

* commit '247e828b5cd63efeae3226c2a9d3bd1f466141dc':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:04:26 +00:00
Craig Mautner
247e828b5c Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" 2015-01-21 17:01:02 +00:00
Geoff Mendal
893e388fc3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: bae67d3  -s ours

* commit 'bae67d30304853ce3898b922ab0753718c89f82c':
  Import translations. DO NOT MERGE
 2015-01-21 16:35:14 +00:00
Geoff Mendal
bae67d3030 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-21 16:32:07 +00:00
Kenny Guy
3458e180cf Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca 
automerge: 11c4cc1

* commit '11c4cc196de9dca3bfad711b1b9e4b779a72cc01':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:24:01 +00:00
Luan Nguyen
f082f8980e Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 2015-01-21 16:19:20 +00:00
Kenny Guy
11c4cc196d Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 
automerge: 06ab0ca

* commit '06ab0ca4812450ec297722957e18b34cbfa733b2':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:17:03 +00:00
Geoff Mendal
0b953a1267 Import translations. DO NOT MERGE 
Change-Id: Icfb7c61dc2e280254ec926c2b706ba2d7dd1273a
Auto-generated-cl: translation import
 2015-01-21 08:14:22 -08:00
Kenny Guy
06ab0ca481 Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 2015-01-21 16:13:24 +00:00
Luan Nguyen
46e804d2a7 docs: Fix conditional in ambient mode check method (18832168). 
Fix issue with non existent variable (18832287).
Fix issue with outdated instructions (18832293).
Fix issue with misleading time tick (18832171).

bug: 18832168
bug: 18832171
bug: 18832287
bug: 18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
 2015-01-21 08:00:45 -08:00
Geoff Mendal
4196fc56bc Import translations. DO NOT MERGE automerge: af69fcd -s ours 
automerge: 45c5f9d  -s ours

* commit '45c5f9d195a4522fdf13915052fe509bbfd80688':
  Import translations. DO NOT MERGE
 2015-01-21 14:26:54 +00:00
Geoff Mendal
45c5f9d195 Import translations. DO NOT MERGE 
automerge: af69fcd  -s ours

* commit 'af69fcd0bd4878145214dc16adbf5ef614e7f3a4':
  Import translations. DO NOT MERGE
 2015-01-21 14:19:37 +00:00
Geoff Mendal
af69fcd0bd Import translations. DO NOT MERGE 
Change-Id: I3d03c8e758bc8ecfe8e8b789fcfeab386e7eec9a
Auto-generated-cl: translation import
 2015-01-21 08:15:11 -06:00
Narayan Kamath
ebc57c7471 Merge "Choose the right executable for wrapped applications." automerge: aa87e89 
automerge: 4af0265

* commit '4af0265a35bcd8a0a7513dd85fe371597e2038c5':
  Choose the right executable for wrapped applications.
 2015-01-21 14:09:33 +00:00
Narayan Kamath
4af0265a35 Merge "Choose the right executable for wrapped applications." 
automerge: aa87e89

* commit 'aa87e89e81b547cc28e09a5f71adb288ee18b32a':
  Choose the right executable for wrapped applications.
 2015-01-21 14:05:29 +00:00
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