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

173342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
ed25274e71 am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev 
automerge: 9e7cb40

* commit '9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b':
  Fix legacy request removal.
 2015-01-22 00:00:43 +00:00
Robert Greenwalt
8379688475 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
automerge: 0343e1a

* commit '0343e1a7042e34589a52b4bf4a0afdcb2d51fc7d':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:59:09 +00:00
Robert Greenwalt
9e7cb40ddf am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev 
* commit 'ab42bbb9024d10579a913049147f6fc25b57df83':
  Fix legacy request removal.
 2015-01-21 23:56:07 +00:00
Robert Greenwalt
0343e1a704 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:56:02 +00:00
Robert Greenwalt
ab42bbb902 Merge "Fix legacy request removal." into lmp-mr1-dev 2015-01-21 23:50:27 +00:00
Robert Greenwalt
7ca16ff8c6 Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 2015-01-21 23:49:12 +00:00
Andrew Solovay
ea4c21ea28 am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d 
* commit 'a1838a9d78eeadc0e578e250b9ff71b1f720148e':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:46:27 +00:00
Luan Nguyen
2c27edc0e0 am 349e3b5a: am f082f898: 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 automerge: 
* commit '349e3b5ad1e3d2f55fadce05a3726f27c8a2b5d5':
  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).
 2015-01-21 23:46:20 +00:00
Andrew Solovay
a1838a9d78 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d 
automerge: 63e822d

* commit '63e822df58b056e35a8a405103b53a2a033c7d33':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:40:51 +00:00
Luan Nguyen
349e3b5ad1 am f082f898: 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 automerge: 8884eda automerge: de9bd40 
automerge: 2b01cfb

* commit '2b01cfbefcdb07640d61f09a92a26c7d3f302773':
  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).
 2015-01-21 23:39:29 +00:00
Andrew Solovay
63e822df58 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 
automerge: d4cf09d

* commit 'd4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:33:10 +00:00
Luan Nguyen
2b01cfbefc am f082f898: 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 automerge: 8884eda 
automerge: de9bd40

* commit 'de9bd40e21696ceeffc67ec24e6e43975461bc60':
  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).
 2015-01-21 23:31:44 +00:00
Andrew Solovay
d4cf09d3a0 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 
automerge: e628954

* commit 'e628954ea49da6a798879815d221f4d2d871e79a':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:22:45 +00:00
Luan Nguyen
de9bd40e21 am f082f898: 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 
automerge: 8884eda

* commit '8884edaaeb0375338f5cf6474c91c3f55f44a172':
  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).
 2015-01-21 23:21:24 +00:00
Andrew Solovay
e628954ea4 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 
* commit '78f4342fac982a130a62dac2a459cef2a4c29f5a':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:10:59 +00:00
Luan Nguyen
8884edaaeb am f082f898: 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 
* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
  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).
 2015-01-21 23:10:55 +00:00
Alan Viverette
2aacb861f4 Avoid ripple buffer creation for empty bounds automerge: b74155c 
automerge: e6e216c

* commit 'e6e216c48ea25bdbc2d0a262c74670fb6513e42b':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:09:39 +00:00
Alan Viverette
e6e216c48e Avoid ripple buffer creation for empty bounds 
automerge: b74155c

* commit 'b74155cf01f959fc9b7909de5a22806ad519f7c9':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:02:58 +00:00
Alan Viverette
b74155cf01 Avoid ripple buffer creation for empty bounds 
Bug: 19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
 2015-01-21 12:30:49 -08:00
Robert Greenwalt
52f25f7b30 am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f 
* commit 'b73f431dddc0ba9260a342f2322e818460cf6f34':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 20:01:50 +00:00
Robert Greenwalt
b73f431ddd Merge "Add + code handling logic for SMS Global Roaming" 
automerge: f19176f

* commit 'f19176ff2f1deb672172f953626fabc45304d435':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 19:56:25 +00:00
Robert Greenwalt
f19176ff2f Merge "Add + code handling logic for SMS Global Roaming" 2015-01-21 19:52:21 +00:00
Andrew Solovay
78f4342fac Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 2015-01-21 19:20:58 +00:00
Dianne Hackborn
f6b4b1a432 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 
automerge: 5346a21

* commit '5346a21bad95796611760d40c1540d1659038216':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:55:12 +00:00
Dianne Hackborn
5346a21bad Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 
automerge: 2132695

* commit '213269599bdec3d83d3d811f5e8f62b9fd8d245c':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:47:11 +00:00
Dianne Hackborn
213269599b Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 2015-01-21 18:41:38 +00:00
Svetoslav
2b2b1a9b89 AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd 
automerge: 03944ce

* commit '03944ce664c733d1922247229fc56f6630c0a5e4':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:39:34 +00:00
Svetoslav
03944ce664 AlertActivity now behaves as a dialog for accessibility purposes. 
automerge: 76ff4dd

* commit '76ff4dd0de8d9747b9341f064dd270c5762705c6':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:31:46 +00:00
Svetoslav
76ff4dd0de AlertActivity now behaves as a dialog for accessibility purposes. 
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.

bug:18865632

Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
 2015-01-21 18:28:03 +00:00
Dianne Hackborn
455625e298 Work on issue #18201239: ANRs in com.google.process.gapps: 
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
 2015-01-21 09:55:13 -08:00
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
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
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