Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
169,893 Commits 3 Branches 0 Tags
e67cf73146cecce5be22264ca7c596b454ded08d
Commit Graph

169893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marvin Paul
e67cf73146 am 364a8fe9: am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev 
* commit '364a8fe9a250093f46581ece2792a3bc7cc06446':
  Added explicit sort order when fetching accounts.
 2014-12-02 18:54:29 +00:00
Marvin Paul
364a8fe9a2 am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev 
* commit '5aeed158df65847edac69761630dcd66b8f66eaa':
  Added explicit sort order when fetching accounts.
 2014-12-02 18:45:53 +00:00
Junda Liu
92205a3365 am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit '50e2d6c2ce079c00531ecbcf112593cb0263e47a':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:45:41 +00:00
Marvin Paul
5aeed158df Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev 2014-12-02 18:36:32 +00:00
Marvin Paul
48fcd4e175 Added explicit sort order when fetching accounts. 
In SQLite, if a sort order is not specified then the ordering is
undefined. In pre-L, SQLite would order accounts by the primary key.
But in L, the newer SQLite version appears to be ordering accounts by
the name.

Bug 18453759

Change-Id: I6bf2b0de59eca4c69472b4279b9e4194c3d3471e
 2014-12-02 18:30:57 +00:00
Junda Liu
50e2d6c2ce am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit 'ef6178a99c57b6de3dc02455e570f932b154b8e1':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:23:49 +00:00
Junda Liu
ef6178a99c Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 2014-12-02 18:18:24 +00:00
Craig Mautner
8abe01aa80 am a370d9d1: am f54954f9: Merge "bug fix possible NPE while startProcessLocked()" 
* commit 'a370d9d19af04c2a9f9d5c5b5794a6a5cd6fd774':
  bug fix possible NPE while startProcessLocked()
 2014-12-02 18:11:25 +00:00
Craig Mautner
b361f48b38 am ca017a38: am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" 
* commit 'ca017a38c9eb12fe92d24a72ad3ee4c33b00e5de':
  [ActivityManager] Invalidate last screenshot when activity relaunched
 2014-12-02 18:04:10 +00:00
Craig Mautner
a370d9d19a am f54954f9: Merge "bug fix possible NPE while startProcessLocked()" 
* commit 'f54954f97599f83584ab736d931b1fe1aff8890c':
  bug fix possible NPE while startProcessLocked()
 2014-12-02 18:03:46 +00:00
Craig Mautner
f54954f975 Merge "bug fix possible NPE while startProcessLocked()" 2014-12-02 17:57:14 +00:00
Craig Mautner
ca017a38c9 am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" 
* commit '50f513c56989337aa0a48304213dd1deee2a0ede':
  [ActivityManager] Invalidate last screenshot when activity relaunched
 2014-12-02 17:56:09 +00:00
Craig Mautner
50f513c569 Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" 2014-12-02 17:50:31 +00:00
Luan Nguyen
3a8d6c8086 am a7ee1243: am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit 'a7ee124305de16fa3acecbb087c0b0cbb1bc649b':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:25:31 +00:00
Jean-Michel Trivi
8e74a8a77e am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 
* commit '874e4502217aa48a06171a7d880b9ca571fd76b1':
  AudioMix address and type, rule exclusion API, dynamic source
 2014-12-02 17:25:24 +00:00
Luan Nguyen
a7ee124305 am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit 'dc1baa16b1c559b07d392f7d899fcfe18fa7036c':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:17:11 +00:00
Jean-Michel Trivi
874e450221 am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 
* commit '57457b98cfec197283c42585a3bc4abb1b21d05b':
  AudioMix address and type, rule exclusion API, dynamic source
 2014-12-02 17:17:06 +00:00
Chris Craik
faf4a61a88 am 363f0d9f: am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 
* commit '363f0d9fd92129c07d769e43fbc9b46dacc01a3b':
  Sync ViewOverlay size init with RenderNode
 2014-12-02 17:13:08 +00:00
Luan Nguyen
dc1baa16b1 am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '2711a5394950f2c61d2cd2ca7f9cfa141a96df34':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:10:49 +00:00
Jean-Michel Trivi
57457b98cf Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 2014-12-02 17:09:30 +00:00
Chris Craik
363f0d9fd9 am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 
* commit '81defc6a840367dcf9591d14b827f2d8d756ef00':
  Sync ViewOverlay size init with RenderNode
 2014-12-02 17:04:34 +00:00
Luan Nguyen
2711a53949 am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '16d0ab86eba2e4f596ac1b96b53391dd0f146b57':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:00:23 +00:00
Chris Craik
81defc6a84 Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 2014-12-02 16:59:21 +00:00
Luan Nguyen
16d0ab86eb am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '6cd78bb2613260b0eb8341748d5cebe4a46f10e5':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 16:50:36 +00:00
Luan Nguyen
6cd78bb261 Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 2014-12-02 16:42:56 +00:00
Jason Monk
2b618bff2d am 613c0555: am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev 
* commit '613c0555ae85a7b79669a4ea5f756f5bf04ac180':
  SysUI: Actual MSIM status bar support
 2014-12-02 16:00:03 +00:00
Christoph Studer
bfecab14f9 am ef1073f7: am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 
* commit 'ef1073f7b45873b5fb87d772c0a5036a2b274917':
  NoMan: Optimize grouped notifications
 2014-12-02 15:52:20 +00:00
Jason Monk
613c0555ae am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev 
* commit 'e47dc36071884600c2b3c1dfe1ffe031fc9f0fde':
  SysUI: Actual MSIM status bar support
 2014-12-02 15:52:17 +00:00
Jason Monk
e47dc36071 Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev 2014-12-02 15:47:36 +00:00
Christoph Studer
ef1073f7b4 am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 
* commit 'ff02faf8f3db791956a99ff0bb87eafb52f333d4':
  NoMan: Optimize grouped notifications
 2014-12-02 15:45:01 +00:00
Christoph Studer
ff02faf8f3 Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 2014-12-02 15:40:10 +00:00
Jason Monk
b574627ebc SysUI: Actual MSIM status bar support 
Expand SignalClusterView and NetworkController to handle multiple
SIMs.  It does this by creating multiple MobileSignalControllers
for each of the active subscriptions on the device.

Also some minor changes for followup on the NetworkController
refactor that went in before this.

Bug: 18222975
Change-Id: Ic7a857cfc5cadb46d51bb9ded0df8187eea799f7
 2014-12-02 10:35:09 -05:00
Paul Crowley
05f23d974b am f57d9dcb: am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 
* commit 'f57d9dcbc7ecbae8bc8f821532a508c22bc3327f':
  Add a tag to separate paragraphs in Javadoc
 2014-12-02 14:57:31 +00:00
Paul Crowley
f57d9dcbc7 am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 
* commit 'fbeeac8266c190afba084cfc1164385ff5020fce':
  Add a tag to separate paragraphs in Javadoc
 2014-12-02 14:48:57 +00:00
Paul Crowley
fbeeac8266 Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 2014-12-02 14:44:27 +00:00
Adrian Roos
86390e72a1 am 3590a45e: am c3056190: Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar 
* commit '3590a45ed2891ed0c9aa5d1d92be80774b43c5c7':
  Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar
 2014-12-02 13:06:03 +00:00
Adrian Roos
3590a45ed2 am c3056190: Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar 
* commit 'c3056190ae1a6d29ce5943d45ab4711e1e49620c':
  Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar
 2014-12-02 12:58:47 +00:00
Adrian Roos
c3056190ae Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar 
Bug: 18518939
Bug: 17691219
Change-Id: I90b9afbbb1a550b5328a581b4fb6aadfa3ff2559
 2014-12-02 12:52:07 +00:00
Paul Crowley
2934b266e5 Add a tag to separate paragraphs in Javadoc 
Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
 2014-12-02 11:21:13 +00:00
Kenny Guy
895fcefec1 am c4f32bb7: am 8f52135f: Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev 
* commit 'c4f32bb74315d36217238acc0af8fbf798a2cd09':
  Allow apps from managed profles to close notification shade.
 2014-12-02 10:29:04 +00:00
Kenny Guy
c4f32bb743 am 8f52135f: Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev 
* commit '8f52135f2c555ae0a13393b60ed0552ee9e149da':
  Allow apps from managed profles to close notification shade.
 2014-12-02 10:21:53 +00:00
Kenny Guy
8f52135f2c Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev 2014-12-02 10:17:21 +00:00
Andre Eisenbach
b45c38acc7 am fcb94852: am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 
* commit 'fcb948526ff400b0773a44aecd56c366c13efa98':
  Add server-side callback for change in MTU (4/4)
 2014-12-02 08:14:11 +00:00
Andre Eisenbach
fcb948526f am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 
* commit 'a1a6c300afffebfb46e84dc1941f6bddca145a8f':
  Add server-side callback for change in MTU (4/4)
 2014-12-02 08:07:48 +00:00
Andre Eisenbach
a1a6c300af Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 2014-12-02 08:02:02 +00:00
Jinsuk Kim
f2d68c8811 am bfe763d1: am b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 
* commit 'bfe763d1c96fe0f8e704743160a478d2e698a801':
  audioservice: system audio control in master volume mode
 2014-12-02 07:36:10 +00:00
Dongwon Kang
b076324c64 am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit '3599af39e45af0498daa4873216a8cf4d6fe67f9':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:36:05 +00:00
Erik Kline
d8b011a354 am d125266b: am f27b52aa: Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev 
* commit 'd125266b3c0cabcb42e6331a312c66071fedd752':
  Revert some verbose logging from ag/489226
 2014-12-02 07:35:59 +00:00
Jinsuk Kim
bfe763d1c9 am b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 
* commit 'b4355ec3d0f7ab0aa44a746df7df250466cd701e':
  audioservice: system audio control in master volume mode
 2014-12-02 07:29:16 +00:00
Dongwon Kang
3599af39e4 am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit '7cfe00f69380573e9c989bbbc614930c279f2291':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:29:10 +00:00