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

164140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
410f7ee403 Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 2014-10-22 20:03:46 +00:00
Christopher Tate
2203e532d6 am 04e6827a: Fix settings db update sequence 
automerge: 281763b

* commit '281763ba1b4a6255799046f78930b586cd7e541c':
  Fix settings db update sequence
 2014-10-22 18:44:40 +00:00
John Reck
5c9d717d3e Fix damage bug 
Bug: 18087374
Change-Id: Ie183392122c73f93010fb3f4be071c924b352966
 2014-10-22 11:32:27 -07:00
Leon Scroggins III
8e8a0d6eaf Remove outdated tests for custom decoder. 
These tests don't appear to be meaningful. We are comparing an
unused decoder against one that is used.

Keeping this test building (the primary changes to this directory
in a while) is not believed to be worth the effort.

BUG:17419670
Change-Id: Ia0862f2a1de1fb9d744382bb949f6c1638a1a12a
 2014-10-22 18:17:14 +00:00
Christopher Tate
aad67a3e48 Don't cancel scheduled jobs when packages are updated 
Only cancel the app's jobs when it is fully uninstalled, not when
it's being updated to a newer version.

Bug 18059252

Change-Id: I6cf617013ec8e9e9abd90e366d7a6ab0711790de
 2014-10-22 11:16:33 -07:00
Christopher Tate
281763ba1b am 04e6827a: Fix settings db update sequence 
* commit '04e6827ace936e0cbb666d8ef94635b73672aa41':
  Fix settings db update sequence
 2014-10-22 18:06:09 +00:00
Christopher Tate
04e6827ace Fix settings db update sequence 
The 'global' table only exists in the owner-user db instance; make
sure to apply global-setting update steps only when bringing up that
instance.

Bug 18069830

Change-Id: I843eabe710d9487de94690921d61adb181b45ed2
 2014-10-22 10:36:42 -07:00
xin He
265e3da006 am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit '5085c4c2933219831bde11a482c8b2934e4a259f':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 17:22:51 +00:00
xin He
5085c4c293 Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 2014-10-22 17:19:26 +00:00
John Spurlock
eb47ce6058 am 0c42c693: am 95dc663d: Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev 
* commit '0c42c693615cc6c7ba288241a908e1a47ee9fabc':
  PowerUI: Post/cancel notification as UserHandle.ALL.
 2014-10-22 17:15:32 +00:00
Ye Wen
3356b4780c am 9921a1db: am 91590bae: Merge "Send HTTP status code back in case of MMS HTTP failure (1/3)" into lmp-mr1-dev 
* commit '9921a1dbb6c38b2b9148cee4bb05660ecaa7689c':
  Send HTTP status code back in case of MMS HTTP failure (1/3)
 2014-10-22 17:15:21 +00:00
Ricardo Cervera
e9438c7b17 am 0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 
* commit '0ae6e37e64144dc180c164cfe42fa8faf59f0d53':
  docs: Removing extra semicolons in Wear notif examples.
 2014-10-22 17:06:56 +00:00
Ricardo Cervera
0ae6e37e64 Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 2014-10-22 17:03:44 +00:00
Quddus Chong
5235772130 am b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
* commit 'b8796e441ce8b4f2e2f75df9689637f6e18f18db':
  docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
 2014-10-22 17:01:51 +00:00
smain@google.com
61139c8d44 add helpouts widget to first round of pages 
Change-Id: I2afafb2bf682c5d514eb1adde27bf0277e709198
 2014-10-22 09:53:40 -07:00
John Spurlock
0c42c69361 am 95dc663d: Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev 
* commit '95dc663d1815704c63a5b18c94c3768068f2ff21':
  PowerUI: Post/cancel notification as UserHandle.ALL.
 2014-10-22 16:48:34 +00:00
Quddus Chong
b8796e441c docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
Change-Id: Ib152d6577d2369b71aa52e6013a2ff1fbcab0c6e
 2014-10-22 09:45:44 -07:00
John Spurlock
95dc663d18 Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev 2014-10-22 16:44:29 +00:00
Ye Wen
9921a1dbb6 am 91590bae: Merge "Send HTTP status code back in case of MMS HTTP failure (1/3)" into lmp-mr1-dev 
* commit '91590bae00d2d9d428892a82f3ac556e3f5e779a':
  Send HTTP status code back in case of MMS HTTP failure (1/3)
 2014-10-22 16:42:44 +00:00
Ye Wen
91590bae00 Merge "Send HTTP status code back in case of MMS HTTP failure (1/3)" into lmp-mr1-dev 2014-10-22 16:37:00 +00:00
John Reck
36c2aa4a63 Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 2014-10-22 16:25:50 +00:00
Craig Mautner
e8b85fd419 Fix dumpsys display apptoken ordering. 
Ordering was bottom up stack ordering but top down apptoken ordering
within each stack. This makes it top down ordering throughout the
dump.

Change-Id: Ie15dbbfc3b21b8df101a0803e556094142dc408e
 2014-10-22 09:23:25 -07:00
Geoff Mendal
3d77d88786 am 9607b858: (-s ours) am 9b67a1a2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9607b858a1e93a1f5b7ca0508bb94142ff68b6fb':
  Import translations. DO NOT MERGE
 2014-10-22 15:57:42 +00:00
Geoff Mendal
2669c781b1 am 1a585056: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '1a585056941de62d2de6bf5d15fffaf5748a4eac':
  Import translations. DO NOT MERGE
 2014-10-22 15:57:37 +00:00
Geoff Mendal
9607b858a1 am 9b67a1a2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9b67a1a232dc0e1cda346271c3a9d118228001ee':
  Import translations. DO NOT MERGE
 2014-10-22 15:53:11 +00:00
Geoff Mendal
c9e4f94227 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-22 15:53:02 +00:00
Wale Ogunwale
cfb2a8d09a am a14f69f5: am f7fb3acf: Merge "Fix issue #17674789: Recents icon resets if persist mode is \'persistNever\'" into lmp-mr1-dev 
* commit 'a14f69f5d9a545e8aed17857c57b1ad955fb71da':
  Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'
 2014-10-22 15:52:41 +00:00
Geoff Mendal
1a58505694 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-22 15:51:57 +00:00
Geoff Mendal
9b67a1a232 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-22 15:49:33 +00:00
Wale Ogunwale
a14f69f5d9 am f7fb3acf: Merge "Fix issue #17674789: Recents icon resets if persist mode is \'persistNever\'" into lmp-mr1-dev 
* commit 'f7fb3acf8fb92890b0a2b9cc0b238e5df80e1cf5':
  Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'
 2014-10-22 15:47:44 +00:00
Geoff Mendal
5bf35f39b0 Import translations. DO NOT MERGE 
Change-Id: I478370f6105138f39c9dad5079b7c434fa8078b3
Auto-generated-cl: translation import
 2014-10-22 08:46:41 -07:00
Wale Ogunwale
f7fb3acf8f Merge "Fix issue #17674789: Recents icon resets if persist mode is 'persistNever'" into lmp-mr1-dev 2014-10-22 15:43:53 +00:00
Geoff Mendal
0668d7855f Import translations. DO NOT MERGE 
Change-Id: Ica314725654add05e972b189aafc338377faeea8
Auto-generated-cl: translation import
 2014-10-22 08:43:33 -07:00
Geoff Mendal
d56bab2c62 Import translations. DO NOT MERGE 
Change-Id: I1a02d1751579ede64ab9d736fd1450dd0b449bfd
Auto-generated-cl: translation import
 2014-10-22 08:41:58 -07:00
John Reck
2615de920b Surface:lockHardwareCanvas DO NOT MERGE 
Bug: 17440886

Cherry pick of bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2

Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de
 2014-10-22 08:33:31 -07:00
John Spurlock
ecbc5e828a PowerUI: Post/cancel notification as UserHandle.ALL. 
- Post power-related notifications for all users.
- Update the pending intent actions on user switch.
- Listen for the intent actions for all users.

Bug: 17300571
Change-Id: I956f09ecf5395f31ae1c1ec0409ee251839fcef4
 2014-10-22 10:48:40 -04:00
John Reck
a2590d595f am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-dev 
automerge: a91c5ca

* commit 'a91c5ca78a0e9b24445126895a0070d399506849':
  Fix memory corruption in test
 2014-10-22 14:29:45 +00:00
John Reck
a91c5ca78a am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-dev 
* commit '733bb3bc78cfb4553441f5d86fce02eb12e32d02':
  Fix memory corruption in test
 2014-10-22 14:21:48 +00:00
John Reck
733bb3bc78 Merge "Fix memory corruption in test" into lmp-mr1-dev 2014-10-22 14:18:21 +00:00
Geoff Mendal
4920a0a14e am 6f26bb5a: (-s ours) am 3961d2af: (-s ours) Import translations. DO NOT MERGE 
* commit '6f26bb5a7f1c9f5c2390e9b2c4a71c6baedad7ec':
  Import translations. DO NOT MERGE
 2014-10-22 13:42:43 +00:00
Geoff Mendal
b571b926f0 Import translations. DO NOT MERGE 
Change-Id: Ifca413c79959bf4b6585f0fb9b7a5ed1acf1ec9f
Auto-generated-cl: translation import
 2014-10-22 06:37:04 -07:00
Geoff Mendal
6f26bb5a7f am 3961d2af: (-s ours) Import translations. DO NOT MERGE 
* commit '3961d2af80f4c0285176f2984b35ffe5ee65ba5a':
  Import translations. DO NOT MERGE
 2014-10-22 13:35:09 +00:00
Geoff Mendal
fdbe4ffc91 am d2c2f935: (-s ours) Import translations. DO NOT MERGE 
* commit 'd2c2f9357b8e8d49cd1a9d74e97693acebd8bf71':
  Import translations. DO NOT MERGE
 2014-10-22 13:33:18 +00:00
Geoff Mendal
d2c2f9357b Import translations. DO NOT MERGE 
Change-Id: I88792b1fde0623df4fd3684e3647fe7674d60098
Auto-generated-cl: translation import
 2014-10-22 06:24:50 -07:00
Geoff Mendal
3961d2af80 Import translations. DO NOT MERGE 
Change-Id: I9d15256733ff57735cfe6a07855a6633d732464c
Auto-generated-cl: translation import
 2014-10-22 06:20:08 -07:00
Wonsik Kim
8f24a8b60f TIF: fix wrong config comparison & confusing method name 
TvStreamConfig should do deep comparison in TvInputHardwareManager
where the object gets created from binder calls. In addition to this
fix, modify [aA]ddStream to [aA]ddOrUpdateStream so that the method
name better reflects what it does.

Bug: 18027719
Change-Id: I43fa668f91cb9433beee97ee31b4b1f58f21bfcf
 2014-10-22 16:27:39 +09:00
Craig Mautner
80a274c696 am 4816ed65: Merge "Debug for bug 18017409" into lmp-mr1-dev 
automerge: 880eb34

* commit '880eb34f24fd2550a1051025e13816b76c0b6af1':
  Debug for bug 18017409
 2014-10-22 05:25:18 +00:00
Leon Scroggins III
85606df575 am 754bffe9: am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
automerge: f408217

* commit 'f408217411f72ec45ced7bb0d028daa59e65b56b':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-22 05:24:20 +00:00
Robin Lee
afa5ae5f8d am de7df08c: am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 
automerge: bd4f2a4

* commit 'bd4f2a473f41fbebb2b0d537542a54174c80e7db':
  DevicePolicy: Restore CA warning to K behaviour
 2014-10-22 05:22:52 +00:00
Dongwon Kang
37f3b0ada4 am a6372b3b: Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev 
automerge: 94e8b9d

* commit '94e8b9dc6e001b6d830caa5ff55f4baa809dbba6':
  TIF: add more documentation on Hardware session.
 2014-10-22 05:19:59 +00:00