154333 Commits

Author SHA1 Message Date
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
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
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
Ricardo Cervera
32cfe2bbc7 am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit 'd37afa37452d5e5dab3704ecab0ab7cebb3da292':
  docs: Unbuntu troubleshooting link to CamelCase ID
2014-10-03 18:00:37 +00:00
Ricardo Cervera
d37afa3745 Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 2014-10-03 17:55:36 +00:00
Mike Lockwood
63ffd78aaa MtpDatabase: Increase size of string buffer in JNI code
Fixes problems handling files that have full path length > 255 characters

Bug: 17383223
Change-Id: I2a1ebedee8dd86b3060f14c2d1af636fc9bc95cb
2014-10-03 17:54:18 +00:00
Ricardo Cervera
43c758b4ce docs: Unbuntu troubleshooting link to CamelCase ID
Change-Id: I705d17346c470563c350df9bb17d23f3fda5fbc5
2014-10-03 09:44:25 -07:00
Robert Greenwalt
eb35fa56a4 am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev
* commit '3515ab8092719ea9f61c8c2859bf586aed0955e3':
  Send callbacks for Net property changes
2014-10-03 15:46:06 +00:00
Robert Greenwalt
3515ab8092 am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev
* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
  Send callbacks for Net property changes
2014-10-03 15:41:04 +00:00
Robert Greenwalt
24861eabe6 Merge "Send callbacks for Net property changes" into lmp-dev 2014-10-03 15:36:39 +00:00
John Spurlock
0dbc6f328e am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit '7da91cc21f0f77277d76001af9133de3923ba686':
  Update framework icons for media & alarm streams.
2014-10-03 14:05:47 +00:00
John Spurlock
7da91cc21f am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
2014-10-03 14:00:29 +00:00
John Spurlock
b930a267f4 am e1cddd34: am a23867c4: Merge "Disable notification effects during phone calls." into lmp-dev
* commit 'e1cddd34eb7099f55790a6a79fed28fb59372092':
  Disable notification effects during phone calls.
2014-10-03 13:58:54 +00:00
John Spurlock
a79caa5340 Merge "Update framework icons for media & alarm streams." into lmp-dev 2014-10-03 13:55:25 +00:00
John Spurlock
e1cddd34eb am a23867c4: Merge "Disable notification effects during phone calls." into lmp-dev
* commit 'a23867c4e8efb4cd9e86c70bff1a595da6679a82':
  Disable notification effects during phone calls.
2014-10-03 13:53:48 +00:00
John Spurlock
a23867c4e8 Merge "Disable notification effects during phone calls." into lmp-dev 2014-10-03 13:49:43 +00:00
Andreas Gampe
edeeea6597 am 24fbf694: am c5146e80: Merge "Revert "Revert "Frameworks/base: Update to preloaded-classes""" into lmp-dev
* commit '24fbf69459ffc880ff86df98fecd13bacfe2631f':
  Revert "Revert "Frameworks/base: Update to preloaded-classes""
2014-10-03 05:55:54 +00:00
Paul Jensen
4736063543 am 367eb2bb: am a11b5e34: Merge "Send updated NetworkAgent score to NetworkFactories when validated." into lmp-dev
* commit '367eb2bb07ae7975b4704a0c1b879f7c34abc623':
  Send updated NetworkAgent score to NetworkFactories when validated.
2014-10-03 05:55:43 +00:00
Paul Jensen
6846f59895 am 6e1bf911: am 6eead851: Merge "Allow any unvalidated Network to satisfy NetworkRequests." into lmp-dev
* commit '6e1bf911039f16bcc20319790014aa08ad04f942':
  Allow any unvalidated Network to satisfy NetworkRequests.
2014-10-03 05:55:40 +00:00
Andreas Gampe
24fbf69459 am c5146e80: Merge "Revert "Revert "Frameworks/base: Update to preloaded-classes""" into lmp-dev
* commit 'c5146e8080b8abaaf92fd98ff5f84e8c4b3d049e':
  Revert "Revert "Frameworks/base: Update to preloaded-classes""
2014-10-03 04:41:46 +00:00
Andreas Gampe
c5146e8080 Merge "Revert "Revert "Frameworks/base: Update to preloaded-classes""" into lmp-dev 2014-10-03 04:30:06 +00:00
Robert Greenwalt
a848c1cc0a Send callbacks for Net property changes
LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
2014-10-02 21:05:44 -07:00