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

171563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
f088c349df Fix style 
Change-Id: I7227b0eac126bf470ed50249a7809b845872983b
 2014-12-12 09:49:29 -08: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
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
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
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
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
Jim Miller
69935f9a05 am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 
automerge: 0ca6b7f

* commit '0ca6b7f98085c079ccfb4b799fba5f570380a827':
  Attempt to fix keyguard missing bug
 2014-12-12 04:29:11 +00:00
John Reck
ec9b598c7b am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev 
automerge: b21a7ad

* commit 'b21a7ad02e43900ea5480e796cb1518bd5829e3f':
  Force-flush state sync on texid change
 2014-12-12 04:27:14 +00:00
Chris Craik
3f454e7d1c am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev 
automerge: 00905a9

* commit '00905a984c07ffc9960ce83548631c59aae37ec6':
  Correct layer size formatting in trace
 2014-12-12 04:25:43 +00:00
Craig Mautner
2d6627a9f2 am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev 
automerge: 922f8e2

* commit '922f8e2c0f58e57d02ab136f24f135553e6d9720':
  Don't apply animations to windows that are showing
 2014-12-12 04:24:34 +00:00
David Friedman
99385aa992 am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
automerge: e90a170

* commit 'e90a170f67f91d9b0166ac4f0de07f63207b1bce':
  Adds link to related video.
 2014-12-12 04:23:07 +00:00
Wink Saville
6e04a7b654 Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 2014-12-12 04:22:40 +00:00
Alan Viverette
3ead4127ae am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev 
automerge: 4b7f724

* commit '4b7f724fb23166f892781ae7daa2df76bede2134':
  Improve time picker accessibility
 2014-12-12 04:21:42 +00:00
Winson Chung
51fafe26a8 am 47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug 18718114)" into lmp-mr1-dev 
automerge: 8c8c99c

* commit '8c8c99cf0873e10f19d79bfe79d8ea56848dadb4':
  Fixing issue with old thumbnails on first launch of app. (Bug 18718114)
 2014-12-12 04:20:19 +00:00
Joe Fernandez
6ea9db4b64 am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs 
automerge: a878256

* commit 'a878256b59e1766ce918257dbfe343b0d3d0ec2d':
  docs: studio basics haxm updates
 2014-12-12 04:19:03 +00:00
Ricardo Cervera
c0276ebd93 am af7070e6: am 64d97cb2: am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs 
automerge: 575c8c9

* commit '575c8c9fcdc2ee8ed614ac9b6a4992fffe8ccea4':
  docs: Fixes to watch faces docs.
 2014-12-12 04:17:41 +00:00
Rich Slogar
cc46ad8d66 am 0564cee3: am b490f297: am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs 
automerge: 51f1c26

* commit '51f1c26b5b4b2c514fd5a4ca11de98542ccd4166':
  docs: studio bundle update
 2014-12-12 04:16:30 +00:00
Joe Fernandez
11fc651aef am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs 
automerge: cc08e61

* commit 'cc08e619d6a946b58b2aae857e3190b5996c07b8':
  docs: platform updates for api 21
 2014-12-12 04:14:43 +00:00
Joe Fernandez
4cb6d10d5e am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 
automerge: 11bccb1

* commit '11bccb1ebe457bc3cca582320d13a459920425d9':
  docs: sdk tools 24.0.1 revisions
 2014-12-12 04:13:20 +00:00
Andrew Solovay
d96ed254db am 13e0a650: am a97053fd: am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes" 
automerge: fe96791

* commit 'fe967912faf8ddf79d9eab794c4a2417758b716d':
  docs: Added info about managed profiles to "Android 5.0 Changes"
 2014-12-12 04:11:53 +00:00
Ruben Brunk
c7c20b34ec am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 
automerge: 81b381b

* commit '81b381b82e83ec742a8a6541dabbc63dae087c0a':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-12 04:09:55 +00:00
Jason Monk
239c7667dd am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev 
automerge: 70cf2f7

* commit '70cf2f72f2e19570d81c1365164313437b38ffd5':
  Fix crash in BluetoothControllerImpl
 2014-12-12 04:08:33 +00:00
Amit Mahajan
dee84a8796 am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev 
automerge: cac8662

* commit 'cac8662943b28663fefc6e5315a7b9acd514bfdb':
  Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
 2014-12-12 04:05:59 +00:00
John Spurlock
97a2be8672 am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 
automerge: 6f9a717

* commit '6f9a71729f6ba7521ed8461ec8b556a8907743b1':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-12 04:04:40 +00:00
Iliyan Malchev
72468d2d14 am 45838de9: fix Uss accounting in getPssPid() 
* commit '45838de942b87150fc3b03a8b943841a8647fd81':
  fix Uss accounting in getPssPid()
 2014-12-12 00:34:35 +00:00
Iliyan Malchev
45838de942 fix Uss accounting in getPssPid() 
Change-Id: I0d1dc81d127afbf3a7d7b4b86865ccb0e8bd7d4c
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2014-12-12 00:20:24 +00:00
Jim Miller
0ca6b7f980 am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 
* commit '4841a787b3380ba045a465e347668729b19f3d79':
  Attempt to fix keyguard missing bug
 2014-12-11 23:41:03 +00:00
Jim Miller
4841a787b3 Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 2014-12-11 23:33:10 +00:00
Christopher Tate
8965a8da55 Properly recognize repeating wakeup alarms 
cherry-pick from lmp-mr1-dev

The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral.  Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
(cherry picked from commit 864d42eb96a9127b7d2f10ad11e709c24b4b4304)
 2014-12-11 23:22:41 +00:00
John Reck
b21a7ad02e am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev 
* commit 'b9a4d15d0942a55c7dc32a471ee40890986e3fab':
  Force-flush state sync on texid change
 2014-12-11 22:49:52 +00:00
Chris Craik
00905a984c am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev 
* commit '63c7b24645d94c92dc6dc32d57c23b5167950c8b':
  Correct layer size formatting in trace
 2014-12-11 22:49:46 +00:00
John Reck
b9a4d15d09 Merge "Force-flush state sync on texid change" into lmp-mr1-dev 2014-12-11 22:44:19 +00:00
Chris Craik
63c7b24645 Merge "Correct layer size formatting in trace" into lmp-mr1-dev 2014-12-11 22:43:18 +00:00
Craig Mautner
922f8e2c0f am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev 
* commit '72b047c6c37ddf860be15b159b9a143be36d7425':
  Don't apply animations to windows that are showing
 2014-12-11 22:29:58 +00:00
David Friedman
e90a170f67 am e84bf9fd: am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
* commit 'e84bf9fddce69f2cc6b9e5f4274419a4122476a2':
  Adds link to related video.
 2014-12-11 22:29:53 +00:00
Chris Craik
c2379070a4 Correct layer size formatting in trace 
bug:18722704
Change-Id: Icef9aaa62633b2d86ad250f43d4c8fa5cc0b6842
 2014-12-11 14:29:51 -08:00
Craig Mautner
72b047c6c3 Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev 2014-12-11 22:27:54 +00:00
John Reck
9a7fe1a034 Force-flush state sync on texid change 
Bug: 18718646

Caused because the Texture object thought the GLES texture
was in a different state than it was as it persists across
EGL/GL contexts. Fix this by force-flushing the default
values when the texid has changed.

Change-Id: I264bac9a2beb08df8e2ba8a85ad15f0dd1fce22a
 2014-12-11 14:27:39 -08:00
David Friedman
e84bf9fddc am d0d76540: am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
* commit 'd0d76540ae937d6773793ba053e81ee3667d0ba6':
  Adds link to related video.
 2014-12-11 22:21:16 +00:00
Alan Viverette
4b7f724fb2 am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev 
* commit 'ff44188309fca037892d0ded64cfee04a3a71c42':
  Improve time picker accessibility
 2014-12-11 22:19:07 +00:00
Alan Viverette
ff44188309 Merge "Improve time picker accessibility" into lmp-mr1-dev 2014-12-11 22:11:56 +00:00
David Friedman
d0d76540ae am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
* commit 'c82392df7caa12836d97650c7528f216d3c2b76f':
  Adds link to related video.
 2014-12-11 22:10:48 +00:00
David Friedman
c82392df7c am 1ab615b3: Merge "Adds link to related video." into lmp-docs 
* commit '1ab615b3e6a7ae820fde4ba067f76dff635f3639':
  Adds link to related video.
 2014-12-11 22:03:42 +00:00
David Friedman
1ab615b3e6 Merge "Adds link to related video." into lmp-docs 2014-12-11 21:55:25 +00:00
Wink Saville
a54bf65833 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId. 
Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
 2014-12-11 13:37:50 -08:00