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

167533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
9713d74018 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 
automerge: aa53920

* commit 'aa53920479b7e1916e0d2afbf6846250a2deeabf':
  Remove needlessly thrown IOException.
 2014-11-10 23:54:59 +00:00
Adrian Roos
b7f421875e am 7dc3d703: Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev automerge: e6ef98c 
* commit '7dc3d7033b4b7a90514772dbee9702257f1fe367':
  Add caching to LockSettingsStorage
 2014-11-10 22:35:52 +00:00
Evan Charlton
13cf9cf1d3 am 3caf6fc7: Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev automerge: e2e649f 
* commit '3caf6fc7df2e4240ae26026d4e1e9c3a23432975':
  Apply @hide / @SystemApi to android.telecom.*
 2014-11-10 22:35:46 +00:00
Adam Lesinski
9687153de3 Merge "Merge commit 'fa31eb2c' into manualmerge" into lmp-mr1-dev-plus-aosp 2014-11-10 22:33:51 +00:00
Adam Lesinski
4d29c66930 Merge commit 'fa31eb2c' into manualmerge 
Conflicts:
	tools/split-select/RuleGenerator_test.cpp

Change-Id: I0d1261301d433f32e857cf1b0d75a861205f7625
 2014-11-10 14:32:11 -08:00
Yabin Cui
19d4e7806a am a9235301: Merge "kill HAVE_SCHED_SETSCHEDULER" 
* commit 'a9235301ad190814c779a13479b204f01980898f':
  kill HAVE_SCHED_SETSCHEDULER
 2014-11-10 22:24:03 +00:00
Yabin Cui
a9235301ad Merge "kill HAVE_SCHED_SETSCHEDULER" 2014-11-10 22:12:28 +00:00
Elliott Hughes
984d81c393 am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." 
* commit 'c34e63598e318c9aa0debde09730a26c64bc1203':
  bionic's struct stat is now POSIX-compliant.
 2014-11-10 22:10:21 +00:00
Deepanshu Gupta
aa53920479 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c 
automerge: a09dda8

* commit 'a09dda8162ca48bea0fea0e2804af38e216996d8':
  Remove needlessly thrown IOException.
 2014-11-10 22:10:07 +00:00
Deepanshu Gupta
a09dda8162 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c 
* commit '0e3925dfb3ea4e9185202dd963f03f5ca1df17d0':
  Remove needlessly thrown IOException.
 2014-11-10 22:05:16 +00:00
John Spurlock
7346a1ad0a am 551f0778: Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev automerge: 7936ca3 
* commit '551f0778c39b030ebf1fd51c882c152b3e7ac320':
  Zen: Pull next-alarm tracking out into separate helper.
 2014-11-10 22:04:39 +00:00
Santos Cordon
fac1b941e9 am 2ace3d48: Make add-call a global property of telecom. (1/4) automerge: 6c912b7 
* commit '2ace3d4803fff437387d36f27dab05f1c159b710':
  Make add-call a global property of telecom. (1/4)
 2014-11-10 22:04:33 +00:00
Adrian Roos
8953c119fd am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71 
* commit '4dfc666cd2e77602c98b0c5214169f5fb47af846':
  Disable LockPatternUtilsCache
 2014-11-10 22:04:27 +00:00
Jorim Jaggi
050ea8569a am 105ff073: Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev automerge: f4a15d4 
* commit '105ff0731075f9dab8bc6c7cb47bc5250abab1e2':
  Fix Keyguard affordances for RTL
 2014-11-10 22:04:22 +00:00
Alan Viverette
e4404938c2 am 5ec0f1c9: Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev automerge: c0bf068 
* commit '5ec0f1c9deb37c2eca4d717e2076e5982bbef99b':
  Clean up encapsulation in date picker classes
 2014-11-10 22:04:15 +00:00
Dan Sandler
34f24aef58 am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
  Fix inset hinting when adding window
 2014-11-10 22:04:09 +00:00
Adrian Roos
7dc3d7033b Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev 
automerge: e6ef98c

* commit 'e6ef98cf0528cbc2722b979e5ad86ba859fa78b0':
  Add caching to LockSettingsStorage
 2014-11-10 21:48:50 +00:00
Deepanshu Gupta
0e3925dfb3 Merge "Remove needlessly thrown IOException." into lmp-dev 
automerge: f305d2c

* commit 'f305d2c4a80af9e2011824349adc6f133cd8822c':
  Remove needlessly thrown IOException.
 2014-11-10 20:56:36 +00:00
Adrian Roos
e6ef98cf05 Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev 2014-11-10 20:33:10 +00:00
Evan Charlton
3caf6fc7df Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev 
automerge: e2e649f

* commit 'e2e649f5371857e0df41356512c6e06663ba8577':
  Apply @hide / @SystemApi to android.telecom.*
 2014-11-10 20:29:27 +00:00
Adrian Roos
3dcae68501 Add caching to LockSettingsStorage 
Bug: 18163444
Change-Id: I4caa80ca55efec761e965807ae793db41864321f
 2014-11-10 21:27:49 +01:00
Yabin Cui
65b4a68669 kill HAVE_SCHED_SETSCHEDULER 
Bug: 18300670

Change-Id: I3033c3542e83963e72d49a639db76501d12ad581
 2014-11-10 12:21:57 -08:00
Evan Charlton
e2e649f537 Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev 2014-11-10 19:54:36 +00:00
Adam Lesinski
fa31eb2cd1 Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev 
automerge: a674a1e

* commit 'a674a1ee79e34749127524434fd7439e7fd5ba09':
  split-select: Fix rules generated for anydpi density
 2014-11-10 19:54:31 +00:00
John Spurlock
551f0778c3 Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev 
automerge: 7936ca3

* commit '7936ca36d9dfd620df0bfead6c79b5eddc761c20':
  Zen: Pull next-alarm tracking out into separate helper.
 2014-11-10 19:53:14 +00:00
Evan Charlton
0e094d926c Apply @hide / @SystemApi to android.telecom.* 
Move the android.telecom.* namespace back to @hide, and also mark it
with @SystemApi so that system-privileged apps can use them.

Bug: 18302450
Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
 2014-11-10 11:52:31 -08:00
Santos Cordon
2ace3d4803 Make add-call a global property of telecom. (1/4) 
automerge: 6c912b7

* commit '6c912b7d056c67b41fd46f31de168795e97c2336':
  Make add-call a global property of telecom. (1/4)
 2014-11-10 19:51:50 +00:00
Adam Lesinski
a674a1ee79 Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev 2014-11-10 19:45:28 +00:00
John Spurlock
7936ca36d9 Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev 2014-11-10 19:24:16 +00:00
Santos Cordon
6c912b7d05 Make add-call a global property of telecom. (1/4) 
ADD_CALL didn't make sense as a property of Connection or Call.
This changes it to be a global property instead.

Bug: 18285352
Change-Id: I658e7a6977a848600272cde2914612c8691bb801
 2014-11-10 19:19:35 +00:00
Adrian Roos
4dfc666cd2 Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev 
automerge: a0ecc71

* commit 'a0ecc714c3aeaaa05649e0ab1f054cc8efbb126f':
  Disable LockPatternUtilsCache
 2014-11-10 19:06:54 +00:00
Jorim Jaggi
105ff07310 Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev 
automerge: f4a15d4

* commit 'f4a15d438acad20cc46fa2fbec0aa1e5cf85b4ff':
  Fix Keyguard affordances for RTL
 2014-11-10 19:05:37 +00:00
John Spurlock
6b0623a112 Zen: Pull next-alarm tracking out into separate helper. 
In preparation for sharing with DowntimeConditionProvider.

Bug: 16373455
Change-Id: If8d90187fa399935137c7ba6152925a9106a4596
 2014-11-10 14:05:13 -05:00
Alan Viverette
5ec0f1c9de Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev 
automerge: c0bf068

* commit 'c0bf068bbff3080b930c9bb50bd6cc935b135536':
  Clean up encapsulation in date picker classes
 2014-11-10 19:04:39 +00:00
Elliott Hughes
c34e63598e Merge "bionic's struct stat is now POSIX-compliant." 2014-11-10 18:55:30 +00:00
Deepanshu Gupta
f305d2c4a8 Merge "Remove needlessly thrown IOException." into lmp-dev 2014-11-10 18:54:21 +00:00
Elliott Hughes
4da9dc5a62 bionic's struct stat is now POSIX-compliant. 
One less hack needed...

Bug: 18298106
Change-Id: I1e9e5ebf329bd6cbaf3445201f182793ee4871ce
 2014-11-10 10:48:25 -08:00
Adrian Roos
a0ecc714c3 Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev 2014-11-10 18:35:59 +00:00
Jorim Jaggi
f4a15d438a Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev 2014-11-10 18:31:55 +00:00
Jorim Jaggi
0a81822272 Fix Keyguard affordances for RTL 
Bug: 17328362
Change-Id: Ic7d7a5a0d721390064493cf753348b89b7bac7e1
 2014-11-10 19:31:22 +01:00
Alan Viverette
c0bf068bbf Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev 2014-11-10 18:29:29 +00:00
Adrian Roos
450ce9fc8a Disable LockPatternUtilsCache 
Also fix a bug where hasPattern and hasPassword were
not invalidated properly.

Bug: 18163444
Change-Id: I5bd8cc4e7c0d00497ee7a42f3c34449aa3f95a6c
 2014-11-10 19:16:41 +01:00
Dan Sandler
eba923ccce am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit '04a1557c497d2ef0ab4011136b0945b20f291bb1':
  Fix inset hinting when adding window
 2014-11-10 18:13:35 +00:00
Dan Sandler
04a1557c49 Merge "Fix inset hinting when adding window" into lmp-mr1-dev 2014-11-10 18:10:36 +00:00
Andres Morales
089792aef9 am 3a868411: am 2885c6ba: Merge "Fix build" into lmp-mr1-dev 
* commit '3a8684117db531f3d56743ffa5a9c8ab7ccd0afd':
  Fix build
 2014-11-10 17:41:40 +00:00
Geoff Mendal
ccfbd1bacc am 20083734: (-s ours) am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '20083734d92eb893c36278d2486404eedc0cc1f9':
  Import translations. DO NOT MERGE
 2014-11-10 17:37:02 +00:00
Paul Jensen
f805988770 am 78a853d1: am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 
* commit '78a853d17a33958ebc7d014cc6ec3998696302d3':
  Fix NetworkMonitor logging to include NetID.
 2014-11-10 17:36:56 +00:00
Andres Morales
3a8684117d am 2885c6ba: Merge "Fix build" into lmp-mr1-dev 
* commit '2885c6ba63850d5fd061460683de768617ed6b31':
  Fix build
 2014-11-10 17:35:55 +00:00
Alan Viverette
8eb4bf6017 am 7213a52c: am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 
* commit '7213a52c42e5dd176b30f01c274f36c63e32718e':
  Update above/below backgrounds in PopupWindow.setBackground()
 2014-11-10 17:32:38 +00:00
Andres Morales
2885c6ba63 Merge "Fix build" into lmp-mr1-dev 2014-11-10 17:31:27 +00:00