Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,534 Commits 3 Branches 0 Tags
9aa9e46b4e02e5f39752d93a3aa0645ede056fa9
Commit Graph

160534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
9aa9e46b4e am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit '5244ab68e4aae1dd95f87e690f7df83c0e630cef':
  Docs: Add "admin" to samples categories
 2014-12-03 18:36:30 +00:00
Trevor Johns
f560f334b0 am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit 'e218d0d3b5feb21e96ccbae62a67dfe5cb3d2ce5':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 18:36:25 +00:00
Trevor Johns
2047e6a0d1 am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '4360c12bcbe1fa36b7aacdda70eb6ac2cf48454a':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 18:36:20 +00:00
Winson Chung
5051109699 am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit 'de9848c641e1b1e0f73e5655c3f8c0c3b34a011c':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 18:36:15 +00:00
Evan Charlton
10dff0a710 am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 
* commit '5ce118d1f4bdaaa1e85626d06d473b2dece949c3':
  Re-add Connection.getCallCapabilities
 2014-12-03 18:36:10 +00:00
Nancy Chen
a1163d575b am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev 
* commit '6963ff0e059977c901f4a961a24e7ffd3536af23':
  Change a semi-colon to a colon in AudioState logging.
 2014-12-03 18:36:02 +00:00
Paul Jensen
3107a9ad24 am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev 
* commit 'f805ba7dcc0e3cde052e2d5a84dedd478f206806':
  Retry failed network validation every 10 minutes.
 2014-12-03 18:35:57 +00:00
Adam Lesinski
72a6aeaca0 am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev 
* commit '91ca64ea291fceb43514b459ba76d13abc80f506':
  AAPT: Add pathMotion custom classes to Proguard Keep set
 2014-12-03 18:35:52 +00:00
Dianne Hackborn
bedd1744b2 am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'ef44c0514d497a789dca4731da61a2cf49bb3289':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 18:35:46 +00:00
Trevor Johns
5244ab68e4 am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit 'b769fc0c576f485022330b40ae5180fb23cc53ee':
  Docs: Add "admin" to samples categories
 2014-12-03 18:12:47 +00:00
Trevor Johns
e218d0d3b5 am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit '25bc6be2843fcff1be9c074f1e92dac1ce76d809':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 18:12:37 +00:00
Trevor Johns
4360c12bcb am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '740b22a522a224f88196ba33e06178e6a576f411':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 18:12:31 +00:00
Winson Chung
de9848c641 Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 2014-12-03 18:10:38 +00:00
Evan Charlton
5ce118d1f4 Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 2014-12-03 18:09:31 +00:00
Nancy Chen
6963ff0e05 Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev 2014-12-03 18:05:58 +00:00
Sailesh Nepal
ef77f0ed78 Re-add Connection.getCallCapabilities 
This method wasn't supposed to be removed.

Bug: 18594044
Bug: 18292176
Change-Id: Iac4cc0972643a8271957e480d3f48d50243af271
 2014-12-03 18:05:48 +00:00
Paul Jensen
f805ba7dcc Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev 2014-12-03 18:04:30 +00:00
Adam Lesinski
91ca64ea29 Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev 2014-12-03 18:04:24 +00:00
Dianne Hackborn
ef44c0514d Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 2014-12-03 18:03:27 +00:00
Dianne Hackborn
7b7c58b384 Work on issue #18572506: AppOps in-memory state is invalid after... 
...uninstalling updates to a system app

Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.

Also introduce more features to the appops command, which are useful
for testing this.

Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
 2014-12-03 10:01:14 -08:00
Trevor Johns
b769fc0c57 am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit '512103d62d932c882ff0c233787be1a902518585':
  Docs: Add "admin" to samples categories
 2014-12-03 17:30:27 +00:00
Trevor Johns
512103d62d am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit '192754842cab0db73f2c1a4f9f78bfe37a84ce0d':
  Docs: Add "admin" to samples categories
 2014-12-03 17:20:52 +00:00
Adrian Roos
b67d8ef665 am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev 
* commit 'f235edf21532c63f149ad8653a76558fba087f3e':
  Refresh user list a little more eagerly
 2014-12-03 17:19:35 +00:00
Svetoslav
5303451efc am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev 
* commit '4667d247bbff30d7fe47a4022b91eb03da17be4d':
  Inconsistent media sizes for es-US locale.
 2014-12-03 17:19:29 +00:00
Jason Monk
d6b001f154 am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev 
* commit '8d72046b9ba06feadbcf71815a1c6e1017c8da37':
  Don't show no sim icon on wifi devices
 2014-12-03 17:19:24 +00:00
Daniel Sandler
b06074723f am 195c4388: Fixing bugs in the LLand. 
* commit '195c438883dfcca799aa456dfe52d24c077e40da':
  Fixing bugs in the LLand.
 2014-12-03 17:19:19 +00:00
Jinsuk Kim
5f23693b5c am 3f6755f5: CEC: Check command type for power status monitor action 
* commit '3f6755f58722bbae532171c384a294e530864ae1':
  CEC: Check command type for power status monitor action
 2014-12-03 17:19:14 +00:00
Craig Mautner
418eecb6f8 am dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev 
* commit 'dad92f3668c8f153b4be946bed32c338c5fb6317':
  Don't process windows belonging to unshown users
 2014-12-03 17:19:01 +00:00
Lorenzo Colitti
d99cd44f31 am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev 
* commit 'dc99c50427ec700fa4b4191b92f0132cf7238c4b':
  Make StatusBar display all default networks.
 2014-12-03 17:18:52 +00:00
Adrian Roos
f235edf215 Merge "Refresh user list a little more eagerly" into lmp-mr1-dev 2014-12-03 17:13:56 +00:00
Svetoslav
4667d247bb Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev 2014-12-03 16:34:00 +00:00
Paul Jensen
7bd8eaf568 Retry failed network validation every 10 minutes. 
This allows for better recovery from ISP outages.

bug:18489123
Change-Id: Iefffe870bd6b7c19827fdbc323024a600a6025f9
 2014-12-03 11:06:14 -05:00
Jason Monk
8d72046b9b Merge "Don't show no sim icon on wifi devices" into lmp-mr1-dev 2014-12-03 14:12:25 +00:00
Daniel Sandler
195c438883 Fixing bugs in the LLand. 
less garish hue on the bugdroid
       :
  +----:-----------+
  | |  : |    Θ.......... improved pop styles
  | |  : @    |    |
  | O  A      |....... occasionally there was no gap to fly
  |      0    O    |   through, creating an unintentional
  | @    |    |    |   commentary on the futility of it all
  +----------------+
     :      :
     :      : animation could continue
     :        after activity pause, sapping
     :        precious cycles
     :
   failure is now more visceral

Bug: 17931806
Change-Id: Iea9bd88e340beb3a0ca310db071ec9f6ec719a33
 2014-12-03 11:53:29 +00:00
Trevor Johns
192754842c Merge "Docs: Add "admin" to samples categories" into lmp-docs 2014-12-03 09:29:49 +00:00
Jinsuk Kim
3f6755f587 CEC: Check command type for power status monitor action 
The action was not checking the command type before processing.
Makes sure the right command is given for the rest of the action flow.

Bug: 18592547
Change-Id: Iaf2584501fc70bfc87e00b74f48cb11c6989f283
 2014-12-03 08:06:39 +00:00
Craig Mautner
dad92f3668 Merge "Don't process windows belonging to unshown users" into lmp-mr1-dev 2014-12-03 07:16:37 +00:00
Lorenzo Colitti
dc99c50427 Merge "Make StatusBar display all default networks." into lmp-mr1-dev 2014-12-03 06:58:10 +00:00
Trevor Johns
25bc6be284 am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit 'e57dda111ce0aeca025ddac252214726db2ce00e':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 03:04:48 +00:00
Trevor Johns
740b22a522 am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '4263334bed38f1d8f3d0318f25cf37ba49926c02':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 03:04:44 +00:00
Filip Gruszczynski
0821a56668 am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit 'f675cad8f5f5781a29ccd733570d90bae3fe8d84':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 02:59:35 +00:00
Trevor Johns
e57dda111c am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit '5bd139bcf09d51dfdd94a24ed9cdffd0c662df60':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 02:56:57 +00:00
Trevor Johns
4263334bed am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '6d54c699e8f86be9c7eb424849768ecc5f56993f':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 02:56:54 +00:00
Filip Gruszczynski
f675cad8f5 am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit '6e854ce5728086b3bd293cb37bd83ebeef52aca8':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 02:53:41 +00:00
Dongwon Kang
25a0518806 am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev 
* commit 'b0bbaec8bec519e85c33b4a25fa138e8017d6424':
  TIF: call tune() in HardwareSession
 2014-12-03 02:39:19 +00:00
Filip Gruszczynski
6e854ce572 Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 2014-12-03 02:23:33 +00:00
Trevor Johns
5bd139bcf0 Merge "Docs: Remove NavigationDrawer sample from What's New page" into lmp-docs 2014-12-03 02:22:42 +00:00
Trevor Johns
6d54c699e8 Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 2014-12-03 02:22:27 +00:00
Dongwon Kang
b0bbaec8be Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev 2014-12-03 02:22:12 +00:00
Sanket Padawe
8e1b08ac26 am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev 
* commit 'b13c12f58db3026ad30849873b3b6fc664f5ce7b':
  Call entitlement on clicking tethering tile in quick settings.
 2014-12-03 02:19:06 +00:00