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

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
2287879039 am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:29:25 +00:00
Rich Slogar
39389af4f1 am f5af4a1e: am 8a7f20f5: am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit 'f5af4a1e34811730b1670ce686948e8dc182936b':
  docs: studio support library revisions update
 2015-01-16 18:17:57 +00:00
Dirk Dougherty
05eb205503 am 8559b145: am f83ae5cd: am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit '8559b145e69f0abd3fa1ae3dd23d253c69032a86':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 18:17:51 +00:00
Rich Slogar
cbe297d4d0 am e1a7b400: am a84faf0f: am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit 'e1a7b400ad0c3da1ff2c544f3ee7245ab62649dd':
  docs: build link update
 2015-01-16 18:17:45 +00:00
Rich Slogar
7d8a43f233 am cd0bdc35: am ab8a5a0e: am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit 'cd0bdc35eb0dc04f615ae94626dd9b01e7ab2890':
  docs: Plugin reference update
 2015-01-16 18:17:40 +00:00
Rich Slogar
20e7ab8667 am d6ed0384: am d15015d2: am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'd6ed0384bf75f23f4184eb92297a4ff8b7f5c090':
  docs: studio sample procedure update
 2015-01-16 18:17:33 +00:00
Svet Ganov
893d6fe48d Fixing a memory leak: activities are leaked. 
TextLine was not fully cleared before recycling it which leads to
activity leaks if the activity happens: to register a text watcher.

bug:19045507

Change-Id: Ife0f7ce29865bd30ca2dfe8795023f51f275d659
 2015-01-16 18:14:36 +00:00
Rich Slogar
f5af4a1e34 am 8a7f20f5: am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit '8a7f20f5a4d83580470133a9a325a66edbb7363e':
  docs: studio support library revisions update
 2015-01-16 18:11:01 +00:00
Dirk Dougherty
8559b145e6 am f83ae5cd: am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit 'f83ae5cd59ed36dd2cd26b88f29582be08c1a134':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 18:10:56 +00:00
Rich Slogar
e1a7b400ad am a84faf0f: am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit 'a84faf0f154bb1097c3206df5710da739dcd03f7':
  docs: build link update
 2015-01-16 18:10:50 +00:00
Rich Slogar
cd0bdc35eb am ab8a5a0e: am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit 'ab8a5a0ea8f9334b997e11c80cba71d024fb8803':
  docs: Plugin reference update
 2015-01-16 18:10:45 +00:00
Rich Slogar
d6ed0384bf am d15015d2: am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'd15015d206cc3feb3c5a8f6327f71d16432ceca0':
  docs: studio sample procedure update
 2015-01-16 18:10:40 +00:00
Chris Craik
a2e1630b1e am 996d3974: am ed35f5c7: Merge "Fast loadInverse() implementation for the common case" 
* commit '996d39743a73cc37fb888779d52323743f50c666':
  Fast loadInverse() implementation for the common case
 2015-01-16 18:07:23 +00:00
Rich Slogar
8a7f20f5a4 am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit 'b43a7eefb75b2a6397d738055389567e1faa21d9':
  docs: studio support library revisions update
 2015-01-16 18:03:41 +00:00
Dirk Dougherty
f83ae5cd59 am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit '7b7f074f282e551439b0b3c40a4ccb44d2981006':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 18:03:36 +00:00
Rich Slogar
a84faf0f15 am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit '3505303a3aa113058bca58a1cdf3c84449b6712e':
  docs: build link update
 2015-01-16 18:03:32 +00:00
Rich Slogar
ab8a5a0ea8 am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit 'f1feda36fbaebf22bf3e06d05ae186ada39a3e1e':
  docs: Plugin reference update
 2015-01-16 18:03:28 +00:00
Rich Slogar
d15015d206 am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'f38122dae0a344bc8abe3eaed7322ea3675b05f5':
  docs: studio sample procedure update
 2015-01-16 18:03:23 +00:00
Chris Craik
996d39743a am ed35f5c7: Merge "Fast loadInverse() implementation for the common case" 
* commit 'ed35f5c788d263c0b4754908b6d5cbb2f5a48caa':
  Fast loadInverse() implementation for the common case
 2015-01-16 18:01:39 +00:00
RoboErik
9c5b7cb048 Notify the system of all remote volume changes 
If a volume change occurred because it was sent through the MediaController directly
it wasn't showing the system's volume UI. This fixes things so the volume slider gets
shown for all volume requests with the SHOW_UI flag set.

bug:19036130
Change-Id: I1f7cb2e03386e2f3f7bc448cb4c38a71573775ff
 2015-01-16 17:57:33 +00:00
Chris Craik
ed35f5c788 Merge "Fast loadInverse() implementation for the common case" 2015-01-16 17:55:40 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00
Narayan Kamath
23e68780be Fix handling of wrapped processes [part 2] 
Drop privileges only if we're root. Zygote.preloadClasses can
be called from a non-root uid / gid in the case of wrapped classes,
so we shouldn't die from the resulting EPERM.

Change-Id: Ie3fbe50a17ec49bcbcb875c3a2ee1e1a3a62e88d
 2015-01-16 17:40:35 +00:00
Jean-Michel Trivi
c2230a9d1a am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue." 
* commit 'ef417bb7a06b0d58faa21f42599d7dd4fd9e3ff2':
  Prevent AudioService dead lock issue.
 2015-01-16 17:37:29 +00:00
Jean-Michel Trivi
ef417bb7a0 am 6a64a9cd: Merge "Prevent AudioService dead lock issue." 
* commit '6a64a9cd26cb8096f1ea67f7c7eee788370752b0':
  Prevent AudioService dead lock issue.
 2015-01-16 17:30:53 +00:00
Ricardo Cervera
97c4ba9862 docs: Added info on noHistory and onActivityResult(). 
Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
 2015-01-16 09:24:30 -08:00
Jean-Michel Trivi
6a64a9cd26 Merge "Prevent AudioService dead lock issue." 2015-01-16 17:23:36 +00:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:14:44 +00:00
Alex Klyubin
6c8c19da7b am 950974e4: am 0b486da6: Merge "Remove DSA support from Android KeyStore and KeyChain." 
* commit '950974e40f08bc8f57668d480997f616ea0d3b5f':
  Remove DSA support from Android KeyStore and KeyChain.
 2015-01-16 16:56:09 +00:00
Alex Klyubin
0624b2c8b7 am a2a5d4cd: am 590c068e: Merge "Add KeyPairGenerator.EC backed by Android KeyStore." 
* commit 'a2a5d4cd6b5809756cb5b157de609623e740fcb4':
  Add KeyPairGenerator.EC backed by Android KeyStore.
 2015-01-16 16:56:02 +00:00
Alex Klyubin
950974e40f am 0b486da6: Merge "Remove DSA support from Android KeyStore and KeyChain." 
* commit '0b486da65076c13c98ab3973128c64f452b4c589':
  Remove DSA support from Android KeyStore and KeyChain.
 2015-01-16 16:49:50 +00:00
Alex Klyubin
a2a5d4cd6b am 590c068e: Merge "Add KeyPairGenerator.EC backed by Android KeyStore." 
* commit '590c068e8380ba73a6571ddf797d4ce02b390bcb':
  Add KeyPairGenerator.EC backed by Android KeyStore.
 2015-01-16 16:49:45 +00:00
Alex Klyubin
0b486da650 Merge "Remove DSA support from Android KeyStore and KeyChain." 2015-01-16 16:44:22 +00:00
Alex Klyubin
590c068e83 Merge "Add KeyPairGenerator.EC backed by Android KeyStore." 2015-01-16 16:44:06 +00:00
Narayan Kamath
2488c0ad50 am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars." 
* commit '27d3e79031081ab131d5bc4680b80e46a466db53':
  Fix a property name that's longer than 31 chars.
 2015-01-16 14:16:59 +00:00
Narayan Kamath
27d3e79031 am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars." 
* commit '706f6cf3839cc3e268e108a8e2e1ac0b2a2287a2':
  Fix a property name that's longer than 31 chars.
 2015-01-16 14:11:16 +00:00
Narayan Kamath
706f6cf383 Merge "Fix a property name that's longer than 31 chars." 2015-01-16 14:06:39 +00:00
Narayan Kamath
e5515772af Fix a property name that's longer than 31 chars. 
The name wasn't chosen without much thought and is intended
to be a temporary fix to keep devices booting while a better
name is decided upon.

bug: 18335678
Change-Id: Ic3451255d870f3395cfbcaa08a7764d93defc350
 2015-01-16 14:04:56 +00:00
Kenny Guy
4be433dc0b am 10dd6eef: am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 
* commit '10dd6eeff86a0618fa2984ae14aafde182f9da9d':
  Sync file before using JournaledFile commit.
 2015-01-16 11:31:13 +00:00
Kenny Guy
10dd6eeff8 am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 
* commit 'fd846dfbf1d1e51f8366a473d3b6f5722c06d77c':
  Sync file before using JournaledFile commit.
 2015-01-16 11:24:56 +00:00
Kenny Guy
fd846dfbf1 Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 2015-01-16 11:21:19 +00:00
Neil Fuller
b3f73dc517 am b55011e4: am f9c04f17: Merge "Removing HttpResponseCacheTest" 
* commit 'b55011e4265f866604ed0c3ffe0241436682c3d2':
  Removing HttpResponseCacheTest
 2015-01-16 10:29:51 +00:00
Jeff Sharkey
75c6a437a5 am 0174cd26: am f24e4900: Merge "Offer to detect non-SSL/TLS network traffic." 
* commit '0174cd26bb1786e6dc7acefd1ae70a0ad2c76543':
 2015-01-16 10:29:49 +00:00
Neil Fuller
b55011e426 am f9c04f17: Merge "Removing HttpResponseCacheTest" 
* commit 'f9c04f17882a61b46f7c6e93cf5f31a2f681c130':
  Removing HttpResponseCacheTest
 2015-01-16 10:23:23 +00:00
Neil Fuller
f9c04f1788 Merge "Removing HttpResponseCacheTest" 2015-01-16 10:19:28 +00:00
Jinsuk Kim
1122d5e760 am 6821efc6: am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play 
* commit '6821efc66f2550bf9cb0d1067462ea10fafe72b9':
  CEC: Do not send <Active Source> when TV wakes up by one touch play
 2015-01-16 08:29:06 +00:00
Jinsuk Kim
c7f3679416 am 2bf3b2c4: am 964c00dd: CEC: Buffer Cec messages while allocating logical address 
* commit '2bf3b2c49c28d028ff615ba49cc876da8ae02fc3':
  CEC: Buffer Cec messages while allocating logical address
 2015-01-16 08:23:33 +00:00
Jinsuk Kim
6821efc66f am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play 
* commit '2ab6d9fff36836c71bc0ee4afa25c11b48a9bd99':
  CEC: Do not send <Active Source> when TV wakes up by one touch play
 2015-01-16 08:23:05 +00:00
Jinsuk Kim
2ab6d9fff3 CEC: Do not send <Active Source> when TV wakes up by one touch play 
TV should respect the device that wakes up TV by one touch play
to keep its active source status by not sending <Active Source>.

Bug: 19039773

Change-Id: I0b27e95dcf986df90b25cc2a1891acd82940f13e
 2015-01-16 17:18:36 +09:00