Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,780 Commits 3 Branches 0 Tags
12a44ca6f4e86cbf5d281eeb063df16ecc6abc27
Commit Graph

177780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luan Nguyen
12a44ca6f4 am 1032dac1: am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps automerge: ee501ed 
* commit '1032dac1f80cb46b796ab4fe31eb1139cabdd8c9':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 22:00:01 +00:00
John Spurlock
5eb898e752 am 9e5e1cf2: am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev automerge: 24ca556 
* commit '9e5e1cf2bb62d6cfc6d97191c92848a610b3a4d9':
  NoMan: Apply audio restrictions when effects are disabled by listeners.
 2014-12-10 21:59:56 +00:00
Dianne Hackborn
cb05679a18 am f85a91e4: am d6372242: Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev automerge: d525891 
* commit 'f85a91e408a0da3799fe1701f450b71e20b68c80':
  Further work on issue #18640385: Add procstats test mode
 2014-12-10 21:59:51 +00:00
Geoff Mendal
d2190ae9fc am 4af46d69: (-s ours) am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE automerge: da409fe -s ours 
* commit '4af46d6999d0b56aff26d6c833aad66cc84401c3':
  Import translations. DO NOT MERGE
 2014-12-10 21:59:47 +00:00
Wink Saville
5109041731 am 3a426694: am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev automerge: afd6f5a 
* commit '3a426694ffa268b331c5b1fc5bb40460d6d883c5':
  Update API and documentation for invalid subscriptions id's
 2014-12-10 21:59:42 +00:00
Dianne Hackborn
69ff299e79 am 9b287368: am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev automerge: 7557ec1 
* commit '9b287368b05f36e322f339b82d2bb495f230ca50':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 21:59:37 +00:00
Geoff Mendal
664effc824 am 71433a90: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: e1bc1c6 -s ours 
* commit '71433a9047721e48d0f49b990dc921561c173e50':
  Import translations. DO NOT MERGE
 2014-12-10 21:59:33 +00:00
Geoff Mendal
93cfdbe173 am 94f01a76: (-s ours) am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 2f5e130 -s ours 
* commit '94f01a767ae91c660a9cd3ff77a0871ea9a54085':
  Import translations. DO NOT MERGE
 2014-12-10 21:59:28 +00:00
Craig Mautner
d2a4320875 am 647130ba: am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev automerge: 8642803 
* commit '647130baacf4f0caf077b5bf6ce00c5e1a23107b':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 21:59:23 +00:00
Jorim Jaggi
274b9c97ea am bcce1830: am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev automerge: 57b440e 
* commit 'bcce1830206b44efaaaa349a7f62637a5da3b290':
  Fix SysUI when an app started from the affordances crashes
 2014-12-10 21:59:18 +00:00
Dan Sandler
8be6baeee3 am 9b0f0d11: am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev automerge: b394253 
* commit '9b0f0d1142c96d3c3caf2be41a9836f18c6fd0e1':
  BluetoothControllerImpl: track bluetooth better
 2014-12-10 21:59:13 +00:00
Geoff Mendal
669a6c77e7 am f26040f0: (-s ours) am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 4ce2c65 -s ours 
* commit 'f26040f05aa54177c6d60df5e45dd2b13cf4388f':
  Import translations. DO NOT MERGE
 2014-12-10 21:59:08 +00:00
Geoff Mendal
63566590ea am 1fb48099: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 83c26e1 -s ours 
* commit '1fb480998d96f7dc66f27664f8050d50d9d2ff26':
  Import translations. DO NOT MERGE
 2014-12-10 21:59:04 +00:00
Geoff Mendal
513250e310 am 0840f961: (-s ours) am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 2a5f0b4 -s ours 
* commit '0840f961e52d45df25f86b2390eb1afa7f3b4e90':
  Import translations. DO NOT MERGE
 2014-12-10 21:58:59 +00:00
Jason Monk
d9a7b8d5a5 am f8830fc5: am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev automerge: 9309db8 
* commit 'f8830fc514b2397c4f6477a03d7def4f60b093d3':
  CarrierText clear itself when no mob. data support
 2014-12-10 21:58:54 +00:00
Geoff Mendal
ec58395d3d am e8c7fe77: (-s ours) Import translations. DO NOT MERGE automerge: f6e3882 -s ours 
* commit 'e8c7fe77319762577b81f4276cf0ceddac4a66d7':
  Import translations. DO NOT MERGE
 2014-12-10 21:58:48 +00:00
Erik Kline
0bf20bea81 am 34b3b53f: am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev automerge: 56d2e8f 
* commit '34b3b53f9c21346282cb889363024fa4c7bb558d':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
 2014-12-10 21:58:42 +00:00
Ricardo Cervera
9ca4ff5174 am c97788f0: am 7cc203d7: am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. automerge: e4afef4 
* commit 'c97788f0549242abc253147249019bd9051bf991':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 21:58:38 +00:00
Joe Fernandez
60648a6faf am c6ff4552: am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs automerge: 39409f2 
* commit 'c6ff45522b11fd0e2d31996f532039150773e7fd':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 21:58:33 +00:00
Ricardo Cervera
c07bbcb37c am fc1e25f3: am d56b7a39: am 504e213f: am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs automerge: a41a241 
* commit 'fc1e25f30deac9f148add51875f92ef4ff473527':
  docs: Creating Custom Watch Faces training class.
 2014-12-10 21:58:28 +00:00
Ricardo Cervera
b2edc00747 am b8217ea7: am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev automerge: 7061697 
* commit 'b8217ea7f0bc217c0c902657521dc51fd5305a65':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 21:58:22 +00:00
Ricardo Cervera
953cf63418 am 85cc4090: am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs automerge: 1b46c2c 
* commit '85cc40907648070c351b66f26163c8aaf3289073':
  docs: Design guidelines for watch faces draft.
 2014-12-10 21:58:17 +00:00
Patrick Tjin
edefe7e094 am 6b4a1c6c: am e3703050: Add recovery kmsg to dropbox automerge: 6aa6733 
* commit '6b4a1c6c46e3f1d3506341aa27e10c5dcc190add':
  Add recovery kmsg to dropbox
 2014-12-10 21:58:12 +00:00
smain@google.com
2c3c4b168b am 835ad716: am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased l 
* commit '835ad71635638f1154a887464758fe81457da327':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
 2014-12-10 21:58:06 +00:00
Joe Fernandez
54ebc61eff am b721e45a: am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs automerge: caad620 
* commit 'b721e45a43b5c8797cea90cf6f908d109689f865':
  docs: Add Distributing to Android Wear doc
 2014-12-10 21:58:02 +00:00
Ricardo Cervera
1e667f650b am b33c8fb4: am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs automerge: 768d97d 
* commit 'b33c8fb4b528c9d80e88a0283812ab4dc76de911':
  docs: Add new classes to Wearable UI library
 2014-12-10 21:57:57 +00:00
Ricardo Cervera
55338ad207 am 9c6e82e7: am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs automerge: 739d0a8c 
* commit '9c6e82e70e9ac2aecd369ee00fadb162b29d5456':
  docs: Add links to wearable support zip for ADT
 2014-12-10 21:57:53 +00:00
Quddus Chong
36e228070a am d7100111: am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs automerge: 20baf9e 
* commit 'd7100111514560a73fe5032f23e59c9e12b49aa1':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 21:57:45 +00:00
Andre Eisenbach
1ee272b064 am f60f29d0: am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev automerge: e832393 
* commit 'f60f29d060a538bd59b79ab8bd69ca6a31d26c29':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 21:57:40 +00:00
Eric Laurent
7a27bc3a76 am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp 
* commit '093789755e5549bd8676d268a6f69b1d6db5026b':
  AudioSystem JNI: Add audio policy custom mixes registration
 2014-12-10 21:57:35 +00:00
Craig Mautner
38b5d057f0 am 93c5cf6a: am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '93c5cf6a6fc928dbfd4426b7bd0c7731bfac0ed2':
  Only one task within the stack should moveToBack
 2014-12-10 21:57:22 +00:00
Wale Ogunwale
cf3e91f5c2 am dc101a11: Always take an activity screenshot when pausing. automerge: 37f2718 automerge: bfa6059 
* commit 'dc101a11df864a36c4d8867b1e7bc4b4d39a90a0':
  Always take an activity screenshot when pausing.
 2014-12-10 21:33:04 +00:00
Amith Yamasani
e289aafae9 am f1ffc75c: Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6 automerge: 7acd880 
* commit 'f1ffc75c9ec093ff780954f86c72a8a7069ca6cf':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 21:32:57 +00:00
Michael Wright
18a635c2a1 am 584674c3: am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev automerge: 422db53 
* commit '584674c39dad11be182ea3763df557d35554157b':
  Don't try to scale the bitmaps for null MediaMetadata.
 2014-12-10 21:32:45 +00:00
Jeff Sharkey
f16df1f34d am 236dc2c8: am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev automerge: 8650c35 
* commit '236dc2c81d9bb2a38b29dd1a4c7e23be25290ef2':
  Throw IOException when missing default ringtone.
 2014-12-10 21:32:39 +00:00
Joe Fernandez
fcc3a8ca1a am 41a635e0: (-s ours) am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs automerge: d36d2aa automerge: 509815b 
* commit '41a635e083c2b8e5fe9f5226645857dd83e400b2':
  :docs studio tips and tricks headings updates
 2014-12-10 21:32:35 +00:00
Geoff Mendal
7f29f2ed5a Merge "Import translations. DO NOT MERGE" 2014-12-10 20:41:31 +00:00
Luan Nguyen
1032dac1f8 am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
automerge: ee501ed

* commit 'ee501ed8483bc66fbff38769da921a37837297f2':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:36:26 +00:00
Geoff Mendal
1372d45f62 Import translations. DO NOT MERGE 
Change-Id: I76f2d3cafc025d0c1c34e0b3fbfc30c73ac3adba
Auto-generated-cl: translation import
 2014-12-10 11:35:51 -08:00
Luan Nguyen
ee501ed848 am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '596d4e7230ae1858aaafbae7987e46d65181f1bd':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:34:30 +00:00
John Spurlock
9e5e1cf2bb am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 
automerge: 24ca556

* commit '24ca556dcea46d21045485626a82e9c1ad244bd6':
  NoMan: Apply audio restrictions when effects are disabled by listeners.
 2014-12-10 19:30:36 +00:00
Luan Nguyen
596d4e7230 am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit 'c9e5c5f72a563c7b8e030a57cf586941d32006f4':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:26:37 +00:00
Dianne Hackborn
f85a91e408 am d6372242: Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 
automerge: d525891

* commit 'd52589185f57ce7eb633d12dec98e4bbae4e33fd':
  Further work on issue #18640385: Add procstats test mode
 2014-12-10 19:26:35 +00:00
Geoff Mendal
4af46d6999 am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE 
automerge: da409fe  -s ours

* commit 'da409fea8230c49666ed634aeb7db629fb9425f3':
  Import translations. DO NOT MERGE
 2014-12-10 19:25:10 +00:00
Wink Saville
3a426694ff am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev 
automerge: afd6f5a

* commit 'afd6f5a37ec4c39fffdb5f29fff7450284a3c562':
  Update API and documentation for invalid subscriptions id's
 2014-12-10 19:23:23 +00:00
John Spurlock
24ca556dce am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 
* commit 'e03e245610c7f406a6cc0de998d71313a285953a':
  NoMan: Apply audio restrictions when effects are disabled by listeners.
 2014-12-10 19:22:41 +00:00
Dianne Hackborn
9b287368b0 am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 
automerge: 7557ec1

* commit '7557ec128f3d2e6dca42b92b2771d1cf486cbb0c':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 19:21:58 +00:00
Geoff Mendal
71433a9047 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: e1bc1c6  -s ours

* commit 'e1bc1c6c9fb8d019813cd8866f5433bb3f4adb04':
  Import translations. DO NOT MERGE
 2014-12-10 19:20:38 +00:00
Geoff Mendal
94f01a767a am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: 2f5e130  -s ours

* commit '2f5e130d4d16eb80e72e492230dec843e1d2c9b2':
  Import translations. DO NOT MERGE
 2014-12-10 19:19:18 +00:00
Luan Nguyen
c9e5c5f72a am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '8a65df39e6ad2fc357c8a327626f40588ce00553':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:19:05 +00:00