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

161657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
9f22aef0c9 resolved conflicts for merge of 57ec13b2 to lmp-mr1-dev-plus-aosp 
Change-Id: I79418b166b9efbc2ca028a05ec04e5a7fd667ee6
 2014-10-03 15:29:32 -07:00
Svetoslav Ganov
04c4b5ea9f am e53a3188: am 9ae2bca4: am 31deb67d: am 76716c5a: Revert "TouchExplorer computes incorrectly the click location." 
* commit 'e53a3188365550d17422e534f6aec80249dbc447':
  Revert "TouchExplorer computes incorrectly the click location."
 2014-10-03 21:52:51 +00:00
Deepanshu Gupta
fe54f8a496 am 09714a76: am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit '09714a76a9463f5e18ea8ac91ba040f6fd2235fd':
  Minor style changes.
 2014-10-03 21:52:46 +00:00
Dianne Hackborn
2fc4d81113 am d6bcda99: am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit 'd6bcda99b062eb0bb8511d7a4a1cefc23df3cb77':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:52:42 +00:00
RoboErik
64cb3ec432 am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '26c2e5a0de022e3842e65337550214c7133aa08b':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:52:37 +00:00
Christopher Tate
24c192b87f am 354ee927: am 33ecc6e0: am b5c55da5: am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev 
* commit '354ee927db8edb36ec7a726069e137f0edd61f7f':
  Fix alarm delivery-order sorting
 2014-10-03 21:52:33 +00:00
Guang Zhu
30fe4a4fca am fbeaa769: am 9098184b: am 35eb8909: am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev 
* commit 'fbeaa769cea6a7c3ef0a7439847dc2b62d235c59':
  Prevent monkey from triggering bugreport
 2014-10-03 21:52:28 +00:00
Dianne Hackborn
cba999c164 am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'e2776f02bf4fd58af88a27261226e9ce124aa6b8':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:52:23 +00:00
Elliott Hughes
57ec13b298 am 1fb235aa: Merge "Fix percentage formatting in SystemUI." into lmp-mr1-dev 
* commit '1fb235aa9ba032c69a93907e349a71352718f85d':
  Fix percentage formatting in SystemUI.
 2014-10-03 21:50:57 +00:00
Svetoslav Ganov
e53a318836 am 9ae2bca4: am 31deb67d: am 76716c5a: Revert "TouchExplorer computes incorrectly the click location." 
* commit '9ae2bca49d2513007de105b199c9ffc0ca0f07d7':
  Revert "TouchExplorer computes incorrectly the click location."
 2014-10-03 21:43:33 +00:00
Deepanshu Gupta
09714a76a9 am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit '82e281810e0eed731a2adddc19eeb65ae73a0dea':
  Minor style changes.
 2014-10-03 21:43:28 +00:00
Dianne Hackborn
d6bcda99b0 am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '02b4caf5f74b9099a56f6e1ed30460f802657f41':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:43:24 +00:00
RoboErik
26c2e5a0de am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '49c14438fd1838851726fad1bb595bfb95764b4c':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:43:20 +00:00
Christopher Tate
354ee927db am 33ecc6e0: am b5c55da5: am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev 
* commit '33ecc6e0fca154993ffab053f33296537adfb510':
  Fix alarm delivery-order sorting
 2014-10-03 21:43:16 +00:00
Guang Zhu
fbeaa769ce am 9098184b: am 35eb8909: am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev 
* commit '9098184bd86f0d8914a951db76e192f87720eaf9':
  Prevent monkey from triggering bugreport
 2014-10-03 21:43:12 +00:00
Dianne Hackborn
e2776f02bf am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit '6b1cf642fc5bda2dfaea2571b24241bd3c2109b4':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:43:07 +00:00
Elliott Hughes
1fb235aa9b Merge "Fix percentage formatting in SystemUI." into lmp-mr1-dev 2014-10-03 21:42:38 +00:00
Svetoslav Ganov
9ae2bca49d am 31deb67d: am 76716c5a: Revert "TouchExplorer computes incorrectly the click location." 
* commit '31deb67dd0c9d204bf3342b7699a240310b1cf34':
  Revert "TouchExplorer computes incorrectly the click location."
 2014-10-03 21:33:16 +00:00
Deepanshu Gupta
82e281810e am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit 'c62da8a0ba8e230f2d759d2219673553999d9c56':
  Minor style changes.
 2014-10-03 21:33:12 +00:00
Dianne Hackborn
02b4caf5f7 am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '02d758a9e83eb1da236f34a2a6b70af89941be43':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:33:08 +00:00
RoboErik
49c14438fd am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '2d553e95c9e16fd37a676acaf1960e9d919c3caf':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:33:05 +00:00
Christopher Tate
33ecc6e0fc am b5c55da5: am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev 
* commit 'b5c55da5ab7e11c2bdc5ff4ba2adadb9867d46fd':
  Fix alarm delivery-order sorting
 2014-10-03 21:33:01 +00:00
Guang Zhu
9098184bd8 am 35eb8909: am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev 
* commit '35eb89097f4f555dc03d4d406359a9ebfa64144d':
  Prevent monkey from triggering bugreport
 2014-10-03 21:32:43 +00:00
Dianne Hackborn
6b1cf642fc am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit '5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 21:32:30 +00:00
Svetoslav Ganov
31deb67dd0 am 76716c5a: Revert "TouchExplorer computes incorrectly the click location." 
* commit '76716c5a180aa471c6973ca7aa03c7f2da677823':
  Revert "TouchExplorer computes incorrectly the click location."
 2014-10-03 21:02:49 +00:00
Deepanshu Gupta
c62da8a0ba am c74a2b34: Merge "Minor style changes." into lmp-dev 
* commit 'c74a2b343507546dd5b0a6be5afce42eb8b16a0d':
  Minor style changes.
 2014-10-03 21:02:45 +00:00
Dianne Hackborn
02d758a9e8 am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '7caa51e6ec6443d5c1fdb96f7e42508b074b4278':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:02:42 +00:00
RoboErik
2d553e95c9 am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 
* commit '7a60cdbd0989fdc262f7838b26c551a3417b7edb':
  Fix regression in RCC.editMetadata(false)
 2014-10-03 21:02:38 +00:00
Christopher Tate
b5c55da5ab am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev 
* commit 'b88ba912f6bb2fd0ae16794470cce38ee308b6ea':
  Fix alarm delivery-order sorting
 2014-10-03 21:02:32 +00:00
Svetoslav Ganov
76716c5a18 Revert "TouchExplorer computes incorrectly the click location." 
This reverts commit 851a5059a47cbf76e530c9d050a677cb6e3f8657 as
it creates a regression. Let us revert this and correctly fix the
issue the original change was trying to address.

bug:17789608

Change-Id: I8abb1a61d5310430e839e4ef60e7ca5cc0cbdd80
 2014-10-03 20:37:10 +00:00
Deepanshu Gupta
c74a2b3435 Merge "Minor style changes." into lmp-dev 2014-10-03 20:30:45 +00:00
Dianne Hackborn
7caa51e6ec Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 2014-10-03 20:15:12 +00:00
RoboErik
7a60cdbd09 Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 2014-10-03 20:13:28 +00:00
Christopher Tate
b88ba912f6 Merge "Fix alarm delivery-order sorting" into lmp-dev 2014-10-03 19:56:36 +00:00
RoboErik
51c07bc0bf Fix regression in RCC.editMetadata(false) 
Found a very simple fix. Just set the cached metadata so we have
it to copy over when editMetadata(false) is called.

bug:17796693
Change-Id: Ib27f0c3d28e7f2a3c7d9495697f36c8045e2bcf6
 2014-10-03 12:45:58 -07:00
Guang Zhu
35eb89097f am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev 
* commit 'ba5df0d01970ec97d64397d9db55f8d1ad98aa16':
  Prevent monkey from triggering bugreport
 2014-10-03 19:44:27 +00:00
Guang Zhu
ba5df0d019 Merge "Prevent monkey from triggering bugreport" into lmp-dev 2014-10-03 19:38:37 +00:00
Christopher Tate
1590f1ee7b Fix alarm delivery-order sorting 
We also refine the order of delivery within any given package.  Now,
we identify which apps have wakeup alarms being delivered in the
current pass, and deliver all of that app's alarms before moving
on to alarm delivery to apps who are only receiving non-wakeup alarms
in the current delivery pass.  The TIME_TICK alarm is also hoisted to
the start of the current delivery pass if present.

Bug 17778686

Change-Id: I6306a00fe657787a77d0254c0807ac51e810fdcf
 2014-10-03 12:33:35 -07:00
Dianne Hackborn
67f175cf07 Fix issue #17811029: Settings provider race when removing users 
Change-Id: Ia40d0a9c161b765d1340db5390d0acdbfc050b81
 2014-10-03 12:29:43 -07:00
Guang Zhu
98a881418a Prevent monkey from triggering bugreport 
Change-Id: Ifa6f06f7dfa63b740352ad7388f33911649afcb0
 2014-10-03 12:23:43 -07:00
Dianne Hackborn
5ebb0e6a1e am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
* commit 'd867b7c7a2c8c151c01b57597b6612ca5355a51a':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
 2014-10-03 19:21:06 +00:00
Elliott Hughes
88d255107d Fix percentage formatting in SystemUI. 
Also remove some orphaned strings that tried to format percentages wrongly.

(The ar and fa localizations will be clobbered, but this lets you test this
change independently.)

Bug: 15476051
Change-Id: Ifd97d47446bdd2e95298b04e1a11542dfed7f9a1
 2014-10-03 12:06:17 -07:00
Dianne Hackborn
d867b7c7a2 Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method... 
...'java.lang.String java.lang.String.substring(int)' on a null object reference

Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
 2014-10-03 11:43:10 -07:00
Ricardo Cervera
6ccc9de87f am ba435fc2: am d019b19e: am 677dd506: am 1e2e4307: am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit 'ba435fc241bbe95c1fde122d14060c9451999f60':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:33:52 +00:00
Ricardo Cervera
ba435fc241 am d019b19e: am 677dd506: am 1e2e4307: am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit 'd019b19e2bd626564c016d65b33aa2e8b9020407':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:28:37 +00:00
Ricardo Cervera
d019b19e2b am 677dd506: am 1e2e4307: am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit '677dd506e66d4e9f7d84922d88188d6fe0b169b4':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:23:19 +00:00
Ricardo Cervera
677dd506e6 am 1e2e4307: am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit '1e2e4307ff381e5cb9d8d19eb6a1aca763ba9415':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:16:03 +00:00
Ricardo Cervera
1e2e4307ff am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit '1242af060bec63ec3a37512ebbbdbe545bd9f0f7':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:11:52 +00:00
Mike Lockwood
5d4a1aaed5 am 2039b757: am 63ffd78a: MtpDatabase: Increase size of string buffer in JNI code 
* commit '2039b757fc6479d5f2a193f855ecc759a2a4ac59':
  MtpDatabase: Increase size of string buffer in JNI code
 2014-10-03 18:06:59 +00:00
Ricardo Cervera
1242af060b am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit '32cfe2bbc71091a1ab282d5c7e4df7db5f6051e6':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:05:41 +00:00