John Reck
f088c349df
Fix style
...
Change-Id: I7227b0eac126bf470ed50249a7809b845872983b
2014-12-12 09:49:29 -08:00
Jinsuk Kim
48cbf292ba
audioservice: Clear calling identity upon calling HdmiControlService
...
This makes sure that accessing the HdmiControlService via audio service
should be possible without the system permission.
Bug: 18730526
Change-Id: I05b364d8e38218eb75f3c08972a06bb2d71a982b
2014-12-13 02:22:19 +09:00
Esteban Talavera
c872c7f7d5
am 4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge: c28fa2c
...
automerge: 0b7b87a
* commit '0b7b87a4c8fec008ca5bdefcd03d8d0ea70f61a0':
Take into account other profiles when deciding whether to show ResolverActivity
2014-12-12 17:19:42 +00:00
Esteban Talavera
0b7b87a4c8
am 4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge: c28fa2c
...
* commit '4f40fb471265a164a0bdfd060d90375ce706b1dd':
Take into account other profiles when deciding whether to show ResolverActivity
2014-12-12 17:17:32 +00:00
Esteban Talavera
4f40fb4712
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
...
automerge: c28fa2c
* commit 'c28fa2cdd4692faafc520972b71ddbac1feec4d3':
Take into account other profiles when deciding whether to show ResolverActivity
2014-12-12 17:08:46 +00:00
Kenny Guy
b8a2df10c9
Don't show last used and profile button at same time.
...
UI for ResolverActivity doesn't support last used
activity and work/personal profile button at the
same time. So if work/personal button is present
disable last used.
Bug: 18730438
Change-Id: I7ae7319bbdeb9bcaab9d6d03f97dea17d07c6d7f
2014-12-12 17:04:08 +00:00
Esteban Talavera
c28fa2cdd4
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
2014-12-12 16:59:31 +00:00
Jason Monk
3aaabd7124
Handle config changes in NetworkController
...
We need to remap or recalculate icons after a config change, so
configs based on mccmnc can update properly.
Bug: 18654943
Change-Id: I6a4c1debf9b266d486143b9869abb569bbc31aef
2014-12-12 11:56:11 -05:00
Jorim Jaggi
b16be0706b
am e741a3e9: am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev
...
automerge: 0b12c6c
* commit '0b12c6cd890272fe7db6c2c3065c7279cb23195b':
Limit item count in QS detail
2014-12-12 15:51:34 +00:00
Jorim Jaggi
be7b1d2690
am 19131b49: am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
...
automerge: 4ec83a7
* commit '4ec83a764d159c19005eefc5457a26dfc134245f':
Fix low FPS when entering wifi/BT detail panel
2014-12-12 15:50:16 +00:00
Jorim Jaggi
b5dc06fcb3
am 569a113a: am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
...
automerge: 8514333
* commit '8514333283c591f4badf823052bc2c1bd1972856':
Improve transition when going to Wifi/BT detail panel
2014-12-12 15:48:55 +00:00
Jorim Jaggi
0b12c6cd89
am e741a3e9: am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev
...
* commit 'e741a3e9fe1d710f5531d134ae317d2b73c57292':
Limit item count in QS detail
2014-12-12 15:46:37 +00:00
Jorim Jaggi
4ec83a764d
am 19131b49: am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
...
* commit '19131b49f62e6a6b21013be1f9f25b3874728a9b':
Fix low FPS when entering wifi/BT detail panel
2014-12-12 15:46:30 +00:00
Jorim Jaggi
8514333283
am 569a113a: am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
...
* commit '569a113a1957fee2a9ef2131f3334e68b30f30f4':
Improve transition when going to Wifi/BT detail panel
2014-12-12 15:46:24 +00:00
Jorim Jaggi
e741a3e9fe
am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev
...
* commit '8934e67051a7c2598ad94699037701c4c6bf83ca':
Limit item count in QS detail
2014-12-12 15:39:27 +00:00
Jorim Jaggi
19131b49f6
am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
...
* commit 'd3cccec08361effa5d0f47143ea8c521f49bad79':
Fix low FPS when entering wifi/BT detail panel
2014-12-12 15:39:22 +00:00
Jorim Jaggi
569a113a19
am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
...
* commit 'ab60f2855b0d2a96fe1610f42a83dc761c4c10e6':
Improve transition when going to Wifi/BT detail panel
2014-12-12 15:39:16 +00:00
Jorim Jaggi
8934e67051
Merge "Limit item count in QS detail" into lmp-mr1-dev
2014-12-12 15:32:57 +00:00
Jorim Jaggi
d3cccec083
Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
2014-12-12 15:32:30 +00:00
Jorim Jaggi
ab60f2855b
Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
2014-12-12 15:32:18 +00:00
John Reck
e9034ee3c6
Fix build breakage
...
automerge: a7c24b4
* commit 'a7c24b439e54706566a6eba673d49152b18c654f':
Fix build breakage
2014-12-12 15:28:39 +00:00
Jason Monk
d8e4bf4e43
Fix tests after inet changes in NetworkController
...
Bug: 17460017
Change-Id: Iee9c4399f5ca4413f1449cfcf05d72a67b0adadc
2014-12-12 10:26:43 -05:00
John Reck
a7c24b439e
Fix build breakage
...
Change-Id: Ib3904c4be5b7df0f6d02f92d63f056968243621d
2014-12-12 07:22:19 -08:00
Narayan Kamath
93bb5419aa
Merge "Remove references to apache-http from various documents."
2014-12-12 14:56:44 +00:00
Narayan Kamath
56eb989791
Remove references to apache-http from various documents.
...
Most of them are pointless links to a "text/plain" constant which are
far clearer when inlined with the relevant text.
Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32
2014-12-12 14:55:18 +00:00
Esteban Talavera
6de72663fa
Take into account other profiles when deciding whether to show ResolverActivity
...
Show ResolverActivity even if there is only one target
on the current profile that listens to that intent,
if other profiles can also handle it.
Also, fix crash while trying to access out of bounds
element on the list.
BUG: 18701336,18713763
Change-Id: I3a5e9cc5c0eedb2792b8f6d8a5d4aa8ee9e1256b
2014-12-12 14:34:29 +00:00
Olawale Ogunwale
eb8320a2d3
am 0e954dcc: am bfb30244: Merge "[ActivityManager] Fix NPE when start activity"
...
automerge: 7fc885b
* commit '7fc885b0bfb8a799825531932567a1d472a55087':
[ActivityManager] Fix NPE when start activity
2014-12-12 14:06:27 +00:00
Olawale Ogunwale
7fc885b0bf
am 0e954dcc: am bfb30244: Merge "[ActivityManager] Fix NPE when start activity"
...
* commit '0e954dccabc4b3d7247c6469864bf20d059e02b9':
[ActivityManager] Fix NPE when start activity
2014-12-12 14:04:24 +00:00
Olawale Ogunwale
0e954dccab
am bfb30244: Merge "[ActivityManager] Fix NPE when start activity"
...
* commit 'bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef':
[ActivityManager] Fix NPE when start activity
2014-12-12 13:57:06 +00:00
Christopher Tate
5ae6848075
am eb9d4fdf: am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d automerge: 0703c09
...
automerge: effe70d
* commit 'effe70d450be1ce5802cf41f487bbe2142797b4b':
Properly recognize repeating wakeup alarms
2014-12-12 13:57:01 +00:00
Christopher Tate
effe70d450
am eb9d4fdf: am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d
...
automerge: 0703c09
* commit '0703c09b9a0568b4c96316c206f9a5e8675cd951':
Properly recognize repeating wakeup alarms
2014-12-12 13:54:33 +00:00
Olawale Ogunwale
bfb30244fb
Merge "[ActivityManager] Fix NPE when start activity"
2014-12-12 13:49:51 +00:00
Christopher Tate
0703c09b9a
am eb9d4fdf: am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d
...
* commit 'eb9d4fdf4623fe23f0f224b5ae2d68cd4c714c7f':
Properly recognize repeating wakeup alarms
2014-12-12 13:33:53 +00:00
Christopher Tate
eb9d4fdf46
am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d
...
* commit 'a91ef1ec04affdf98eb89f11b67fdbae72acb8dd':
Properly recognize repeating wakeup alarms
2014-12-12 13:24:06 +00:00
Bart Sears
08c7233451
Merge "Tune delivery and batching of alarms" into lmp-dev
...
automerge: 3ec6a91
* commit '3ec6a91204ffac6e81eaad7ca29e817e9502f856':
Tune delivery and batching of alarms
2014-12-12 13:15:38 +00:00
Christopher Tate
a91ef1ec04
Properly recognize repeating wakeup alarms
...
automerge: 8965a8d
* commit '8965a8da5513cf31a313ecdac3506718c2813932':
Properly recognize repeating wakeup alarms
2014-12-12 13:14:30 +00:00
Christoph Studer
fde6f4d745
Fix MediaStyle docs mentioning 2 max actions in compact view
...
Bug: 18729304
Change-Id: Ica6b8ac47d7d38b1de62d64830256f66cbbdb225
2014-12-12 13:23:26 +01:00
minho.choo
649acab389
Fix bugs regarding delay the dispatching of non-wakeup alarms
...
checkAllowNonWakeupDelayLocked() method determines that delay the dispatching of non-wakeup alarms.
(there are no wakeup alarms and the screen is off, it can delay until the future.)
if there is any pending non-wakeup alarms, non-wakeup alarm delivery time is bigger than nowELAPSED.
but, checkAllowNonWakeupDelayLocked() returns false and non-wakeup alarm is not delay until future.
i think it is necessary to reverse the inequality symbol on "mNextNonWakeupDeliveryTime > nowELAPSED"
if it isn't, Could you let me know when we get ¡°stuck in a loop¡± in the comment of checkAllowNonWakeupDelayLocked () method?
Change-Id: I7e972064547f4d0a9b4175dbd4cf735b4837abfd
Signed-off-by: Minho Choo <minho.choo@lge.com>
2014-12-12 16:13:55 +09:00
Svet Ganov
09687064f4
Fix a NPE in AccessiiblityManagerService.
...
It is possible that the accessibility windows list is null which
is treated as if there is no window information. The getWindows
method was accessing properties of the windows filed witgout a
null check.
bug:18522998
Change-Id: Ieefe678d3da3d6e8f96c0e4bedac0c55975621fa
2014-12-11 22:59:12 -08:00
Svet Ganov
9fc96c5371
Fix an edge case in computing click location in accessibility mode.
...
In accessibility mode to click a view we computed a point where to send
down and up touch events. The logic that computes where to send the
events was not clipping the bounds of the child to these of the parent.
As a result we wrongly computed we can send the events in a location
of the child that is outside of its parent, thus the click having no
effect or clicking the wrong thing.
bug:18672945
Change-Id: If9c452e7e5b196f699db33d37dbc6775d5d1622a
2014-12-11 22:33:48 -08:00
Wink Saville
6cc211669c
am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: 6cc44cc
...
automerge: 05e2ada
* commit '05e2ada58a79994170e8e98ff9a619715cdddc28':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
2014-12-12 04:45:29 +00:00
Wink Saville
05e2ada58a
am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
...
automerge: 6cc44cc
* commit '6cc44cce0e375b165580a8061359b2ff163a4556':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
2014-12-12 04:42:38 +00:00
Wink Saville
6cc44cce0e
am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
...
* commit '6e04a7b65488656c4cb72d99d285050d56068112':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
2014-12-12 04:37:40 +00:00
C. Sean Young
28ca1f628c
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
2014-12-12 04:35:32 +00:00
Marvin Paul
a6533256ac
Implemented backup and restore for account sync settings.
...
Bug: 18506992
Parent Bug: 17967106
Change-Id: Iecf5ce3a24ac5f12192e65aa61f1560bc76d75a8
2014-12-12 04:35:06 +00:00
Iliyan Malchev
6f8b9bc9c1
am 16568705: am 45838de9: fix Uss accounting in getPssPid() automerge: 72468d2
...
* commit '16568705855f6c8dd78bc188c17e0237c5e827c0':
fix Uss accounting in getPssPid()
2014-12-12 04:35:05 +00:00
Jim Miller
0e0f30eda0
am 69935f9a: am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev automerge: 0ca6b7f
...
* commit '69935f9a053a14da8677b5957bf72ad1746ebad8':
Attempt to fix keyguard missing bug
2014-12-12 04:35:00 +00:00
John Reck
30839ce439
am ec9b598c: am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev automerge: b21a7ad
...
* commit 'ec9b598c7be65abb5ceb9d82e752c50f7e93deab':
Force-flush state sync on texid change
2014-12-12 04:34:55 +00:00
John Reck
d4d19d3714
am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev automerge: b21a7ad
...
automerge: ec9b598
* commit 'ec9b598c7be65abb5ceb9d82e752c50f7e93deab':
Force-flush state sync on texid change
2014-12-12 04:33:59 +00:00
Iliyan Malchev
1656870585
am 45838de9: fix Uss accounting in getPssPid()
...
automerge: 72468d2
* commit '72468d2d146f737b2b5d0223687b8fbc52723c76':
fix Uss accounting in getPssPid()
2014-12-12 04:30:52 +00:00