Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,504 Commits 3 Branches 0 Tags
9917ebed862ed8b687f5d17779c4e250fb5a30f6
Commit Graph

157504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calin Juravle
9917ebed86 am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev 
* commit 'd3a8c8aa530e6c1a605f469df7b378f688e7905a':
  Fix the length of a profiler system property
 2014-10-29 22:49:28 +00:00
Erik Kline
9a8351d9d7 am befe778c: Treat optimistic addresses as global preferred. 
* commit 'befe778c73e48417942fc31c06509bac8e5ca0d2':
  Treat optimistic addresses as global preferred.
 2014-10-29 22:49:23 +00:00
Jinsuk Kim
44ce605024 am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 
* commit '8be95fdde6a359e40e0b8bc6fb7bc9ea6e6091b0':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-29 22:49:16 +00:00
Anthony Lee
fe5e5dc13a am 6727926a: Added a function to clear accounts for a specified package. 
* commit '6727926a9617cb715ee4fa407f547e67a6f7e134':
  Added a function to clear accounts for a specified package.
 2014-10-29 22:49:10 +00:00
Lorenzo Colitti
ba69b3f290 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
* commit 'def4cd4fa4aa035a5000e6b196130496430d65ff':
  Support more than one clatd at a time.
 2014-10-29 22:49:05 +00:00
Alan Viverette
b00c424257 am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 
* commit '05b2fedcb8057f31ed078a59a8cffce131449df0':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-29 22:48:52 +00:00
Shishir Agrawal
47fa171522 am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
* commit 'c8787beca679ca593dda05bb151ebe4afdf441c8':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-29 22:48:43 +00:00
Ihab Awad
0ca329e5d4 am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev 
* commit '6c37f374b5d86c798f799ac498b806d948c77f97':
  PhoneAccounts include literal icon bitmap (1/4)
 2014-10-29 22:48:34 +00:00
Geoff Mendal
07c45951be Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-29 17:23:38 +00:00
Geoff Mendal
a13cc00be5 Import translations. DO NOT MERGE 
Change-Id: Ia99d8513fc58b4cb4437066b52928923ecba9c46
Auto-generated-cl: translation import
 2014-10-29 08:39:25 -07:00
Geoff Mendal
6904eac728 Import translations. DO NOT MERGE 
Change-Id: I1012614178f62c67479ef217b92afe7444d2f075
Auto-generated-cl: translation import
 2014-10-29 06:18:50 -07:00
Calin Juravle
d3a8c8aa53 Merge "Fix the length of a profiler system property" into lmp-mr1-dev 2014-10-29 11:19:23 +00:00
Wei Jin
5cfbcd3b9e Fix the length of a profiler system property 
This patch changes the profiler system property
"dalvik.vm.profile.max-stack-depth" to "dalvik.vm.profile.stack-depth"
so that the length of the option is less than PROP_NAME_MAX.

Bug: 17294224

(cherry picked from commit 4d033e1c44)

Change-Id: I10dd0b3bfa46b836def437a3822f6c48538167dd
 2014-10-29 11:17:42 +00:00
Erik Kline
befe778c73 Treat optimistic addresses as global preferred. 
If the kernel sends notification of an optimistic address then
treat is a useable address (isGlobalPreferred()).

Note that addresses flagged as IFA_F_OPTIMISTIC are
simultaneously flagged as IFA_F_TENTATIVE (when the tentative
state has cleared either DAD has succeeded or failed, and both
flags are cleared regardless).

Additionally: do not consider RFC 4193 ULA addresses sufficient
for "global preffered".  They are, by definition, of global scope
but not sufficient for global reachability.

Bug: 17769720
Change-Id: I759623b28fd52758f2d4d76d167f3cafd9319d6a
 2014-10-29 19:11:58 +09:00
Jinsuk Kim
8be95fdde6 Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 2014-10-29 06:44:36 +00:00
Anthony Lee
6727926a96 Added a function to clear accounts for a specified package. 
Right now, clearAcounts() only clears the accounts
for the calling package. This new function will allow a class like
PhoneAccoutBroadcastReceiver to clear accounts for any package.

Bug: 17689845
Change-Id: I24db104268535e7e0e33e093e8fab63765df0b08
 2014-10-28 22:39:58 -07:00
Lorenzo Colitti
def4cd4fa4 Merge "Support more than one clatd at a time." into lmp-mr1-dev 2014-10-29 03:43:04 +00:00
Jinsuk Kim
5fe3a6cbfc CEC: Use language code "chi" for Traditional Chinese 
Android by default returns "zho" for all sorts of Chinese variants.
Use "chi" for traditional one used in Taiwan/Hong Kong/Macau
as required in CEC standard.

Bug: 18149804

Change-Id: I86ac7e2f0f1121641c52032a0d98a6405554457c
 2014-10-29 11:48:19 +09:00
Alan Viverette
05b2fedcb8 Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 2014-10-29 01:10:09 +00:00
Alan Viverette
f6a36e9cf3 Inflate ActionMode items against the ActionBarContextView theme 
BUG: 18078900
Change-Id: I300a0268bacf7e1ebcd64eac3d79548e1c4a9606
 2014-10-28 17:50:59 -07:00
Shishir Agrawal
c8787beca6 Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 2014-10-29 00:15:51 +00:00
Ihab Awad
6c37f374b5 Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev 2014-10-28 23:48:20 +00:00
Ihab Awad
074bf104c8 PhoneAccounts include literal icon bitmap (1/4) 
Change-Id: I9110d983c0ca6610075bd24975f1e90d123ef9c1
 2014-10-28 15:56:29 -07:00
Sanket Padawe
1ba2b168c0 am 52f811ec: Merge "Remove checks to support new sim color selection." into lmp-mr1-dev 
* commit '52f811ecda5991a3335b8aca4d98020b7a976a42':
  Remove checks to support new sim color selection.
 2014-10-28 22:48:38 +00:00
Alan Viverette
09da6ec635 am 4bf9edfc: Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 
* commit '4bf9edfc1f3a66d6d2f782e7d6f8e9d9002b3971':
  Update drag-to-open menu close behavior
 2014-10-28 22:48:33 +00:00
Sanket Padawe
52f811ecda Merge "Remove checks to support new sim color selection." into lmp-mr1-dev 2014-10-28 22:47:09 +00:00
Alan Viverette
4bf9edfc1f Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 2014-10-28 22:45:33 +00:00
Yorke Lee
3e29a3130a am e398db4a: Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev 
* commit 'e398db4a45d4128af696a664e7c4cc48f7187a7f':
  Add comment to TelecomManager.getCallState
 2014-10-28 22:13:43 +00:00
Yorke Lee
e398db4a45 Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev 2014-10-28 22:08:51 +00:00
Yorke Lee
7c72c2d3c2 Add comment to TelecomManager.getCallState 
Explain why READ_PHONE_STATE permission is not required so that
people don't try to add it in the future. Requiring the permission
causes stability crashes with legacy apps and system components
that don't have the permission.

Change-Id: Idf8766aa409d4a2c4ed3d6f81a398f4a0eb24615
 2014-10-28 14:12:02 -07:00
Adrian Roos
ca6e38792d am 579a7f99: Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 
* commit '579a7f99408a5d310ab8eb2e1b6bc938e1a74c4a':
  Close keyguard user switcher on tap outside
 2014-10-28 20:31:12 +00:00
Adrian Roos
579a7f9940 Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 2014-10-28 20:27:41 +00:00
John Spurlock
e8c3c3f706 am 2896517b: Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev 
* commit '2896517ba13d9b670a749a626ea1270bb446017c':
  Zen: Fix quantity format specifiers for quantity=1.
 2014-10-28 20:10:27 +00:00
Santos Cordon
3126b3e483 am ccbc3e5c: Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev 
* commit 'ccbc3e5c6617b30eabbd171b951bb74ae9108e8b':
  Update javadocs for Telecom APIs.
 2014-10-28 20:06:13 +00:00
Sanket Padawe
d95198eb36 Remove checks to support new sim color selection. 
Remove checks to support new sim color selection in multi-sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
 2014-10-28 13:06:08 -07:00
Jeff Davidson
306eac5f41 am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 
* commit 'f82b029c7c47568f75eb4a7e676baf2cb61c967f':
  Check UID instead of package name when preparing VPN.
 2014-10-28 20:06:08 +00:00
John Spurlock
2896517ba1 Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev 2014-10-28 20:04:20 +00:00
Santos Cordon
ccbc3e5c66 Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev 2014-10-28 20:01:01 +00:00
Jeff Davidson
f82b029c7c Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 2014-10-28 20:00:32 +00:00
John Spurlock
9c4b060e41 Zen: Fix quantity format specifiers for quantity=1. 
Bug: 16824863
Change-Id: I3c7fc5961cd65b0b8291b7d9aef6110e6dfe85f1
 2014-10-28 15:49:25 -04:00
Joe Fernandez
296e0a79b9 am 9513604c: am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs automerge: 56a8cb7 
* commit '9513604cdcfe56eaca70bd5c5a4f672a2b46d1a2':
  docs: Update timing of Android Wear app review
 2014-10-28 19:35:03 +00:00
David Friedman
387675d905 am 79c332a6: am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge: b648cab 
* commit '79c332a694691cef131d049c9f6a8ad59df37000':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 19:34:58 +00:00
Eric Gilmore
7e99cedb50 am 3fc61015: am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge: 77760e7 
* commit '3fc61015f51a3f8ae8516b5e31d7f867f48b6d84':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 19:29:43 +00:00
Quddus Chong
f44baef162 am 50631f97: am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce automerge: eb07af2 
* commit '50631f97b499ad2fc904d5d1cc13ff4c964bee60':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 19:29:36 +00:00
Ricardo Cervera
cf6a28f813 am 989f4bfd: am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents automerge: be07f2a 
* commit '989f4bfd8d06a31dbe42050ea2ce0cbadeacfbfc':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:29:28 +00:00
Joe Fernandez
9513604cdc am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs 
automerge: 56a8cb7

* commit '56a8cb7fd1eff26da30c4ebcb58eae71b9774b81':
  docs: Update timing of Android Wear app review
 2014-10-28 19:28:36 +00:00
David Friedman
79c332a694 am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs 
automerge: b648cab

* commit 'b648cabadfd73bcd3fa8b88db48007f58739300e':
  Updates Notifications screenshot for Android 5.0.
 2014-10-28 19:27:37 +00:00
Eric Gilmore
3fc61015f5 am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. 
automerge: 77760e7

* commit '77760e753eb9a6c533eb2b52f228149e49356f64':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-28 19:26:43 +00:00
Quddus Chong
50631f97b4 am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce 
automerge: eb07af2

* commit 'eb07af2ced7aa438dca941fcde2e3ca0b338a620':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-28 19:25:57 +00:00
Ricardo Cervera
989f4bfd8d am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents 
automerge: be07f2a

* commit 'be07f2a853cb2a69eeecbd7b0d68f455b55edae6':
  docs: Add SearchXonY to Common Intents
 2014-10-28 19:25:10 +00:00